diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 94928e9..deb0678 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 projectname="Gun Run" saveDateTime="2022-09-07T21:07:01" saveUserFull="Timothy Allen" version="3.26.2-Buenos Aires" saveUser="tim">
+<qgis projectname="Gun Run" saveUserFull="Timothy Allen" version="3.26.2-Buenos Aires" saveDateTime="2022-09-08T19:43:58" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,98 +21,98 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Marshals">
+    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" expanded="1" name="marshal_positions" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="marshal_positions" expanded="1" checked="Qt::Checked" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions" legend_split_behavior="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="extra_security20170921130834191" patch_size="0,0" source="./extra_security.shp" expanded="1" name="extra_security" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="extra_security" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./extra_security.shp" legend_split_behavior="0" id="extra_security20170921130834191" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="delimitedtext" id="marshals_by_position20161003112326575" patch_size="0,0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" expanded="1" name="marshals_by_position" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="marshals_by_position" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_split_behavior="0" id="marshals_by_position20161003112326575" providerKey="delimitedtext" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" expanded="1" name="complete_marshal_overview" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="complete_marshal_overview" expanded="1" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_split_behavior="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" expanded="0" name="marshal_overviews" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="marshal_overviews" expanded="0" checked="Qt::Unchecked" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews" legend_split_behavior="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Fencing and Cones">
+    <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" source="./fencing.shp|layername=fencing" expanded="1" name="fencing" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" expanded="1" name="fence_groups" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="fence_groups" expanded="1" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_split_behavior="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Markers">
+      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer checked="Qt::Checked" providerKey="memory" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={fc78e3c3-f2c3-48fc-a4ad-be3463968bb0}" expanded="1" name="route_markers" legend_split_behavior="0" legend_exp="">
+        <layer-tree-layer name="route_markers" expanded="1" checked="Qt::Checked" legend_exp="" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={d928530c-6b86-4858-af3e-b4cb7b7e87c6}" legend_split_behavior="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" providerKey="memory" patch_size="-1,-1">
           <customproperties>
             <Option/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option name="showFeatureCount" value="0" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " expanded="0" name="timelapse" legend_split_behavior="0" legend_exp="">
+    <layer-tree-layer name="timelapse" expanded="0" checked="Qt::Unchecked" legend_exp="" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_split_behavior="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" patch_size="0,0">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Feeding Stations">
+    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="water_tables20170921142016467" patch_size="0,0" source="./water_tables.shp" expanded="1" name="water_tables" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="water_tables" expanded="1" checked="Qt::Checked" legend_exp="" source="./water_tables.shp" legend_split_behavior="0" id="water_tables20170921142016467" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -120,95 +120,95 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="0" name="Ask Me">
+    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" expanded="1" name="poi_labels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="0" name="Residents Access">
+    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" source="./mayor.shp" expanded="1" name="mayor" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="mayor" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./mayor.shp" legend_split_behavior="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" source="./viplabels.shp" expanded="1" name="viplabels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="viplabels" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./viplabels.shp" legend_split_behavior="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" source="./vipaccess.shp" expanded="1" name="vipaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="vipaccess" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./vipaccess.shp" legend_split_behavior="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" source="./golfaccess.shp" expanded="0" name="golfaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="golfaccess" expanded="0" checked="Qt::Unchecked" legend_exp="" source="./golfaccess.shp" legend_split_behavior="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" source="./residents_access.shp|layername=residents_access" expanded="1" name="residents_access" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="residents_access" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./residents_access.shp|layername=residents_access" legend_split_behavior="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="OSM data">
+    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" source="./osm_roads.shp" expanded="0" name="osm_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="osm_roads" expanded="0" checked="Qt::Checked" legend_exp="" source="./osm_roads.shp" legend_split_behavior="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" source="./osm_places.shp|layername=osm_places" expanded="1" name="osm_places" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="osm_places" expanded="1" checked="Qt::Checked" legend_exp="" source="./osm_places.shp|layername=osm_places" legend_split_behavior="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Start and Finish pages">
+    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" source="./data-comments.shp" expanded="1" name="data-comments" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="data-comments" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./data-comments.shp" legend_split_behavior="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" source="./start_finish_area.shp" expanded="1" name="start_finish_area" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="start_finish_area" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./start_finish_area.shp" legend_split_behavior="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -216,30 +216,30 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="0" name="Elevation">
+    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" source="./capetownelevation-1m.shp" expanded="1" name="capetownelevation-1m" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="capetownelevation-1m" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./capetownelevation-1m.shp" legend_split_behavior="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Map">
+    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" expanded="0" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" expanded="0" checked="Qt::Checked" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_split_behavior="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" expanded="1" name="Outlines" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="Outlines" expanded="1" checked="Qt::Checked" legend_exp="" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" legend_split_behavior="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -275,42 +275,42 @@
       <item>route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings self-snapping="1" maxScale="0" unit="1" scaleDependencyMode="0" tolerance="10" intersection-snapping="1" enabled="0" mode="3" minScale="0" type="1">
+  <snapping-settings intersection-snapping="1" unit="1" mode="3" type="1" scaleDependencyMode="0" enabled="0" maxScale="0" tolerance="10" self-snapping="1" minScale="0">
     <individual-layer-settings>
-      <layer-setting units="1" maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" enabled="0" minScale="0" type="0"/>
-      <layer-setting units="1" maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" enabled="0" minScale="0" type="0"/>
-      <layer-setting units="1" maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="2" maxScale="0" id="extra_security20170921130834191" tolerance="0" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="2" maxScale="0" id="water_tables20170921142016467" tolerance="0" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" minScale="0" type="2"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="2" maxScale="0" tolerance="0" id="water_tables20170921142016467" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="2" maxScale="0" tolerance="0" id="extra_security20170921130834191" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" minScale="0"/>
+      <layer-setting type="0" enabled="0" units="1" maxScale="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" minScale="0"/>
+      <layer-setting type="0" enabled="0" units="1" maxScale="0" tolerance="12" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" minScale="0"/>
+      <layer-setting type="2" enabled="1" units="1" maxScale="0" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.34670034168259889</xmin>
-      <ymin>-33.93126515591272607</ymin>
-      <xmax>18.44512091979134283</xmax>
-      <ymax>-33.87832298122218333</ymax>
+      <xmin>18.39069478681656378</xmin>
+      <ymin>-33.91292087720002257</ymin>
+      <xmax>18.40914864521195327</xmax>
+      <ymax>-33.90299421944554581</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -331,161 +331,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Checked" name="Marshals" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="marshal_positions" showFeatureCount="1" open="true">
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer drawingOrder="-1" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="extra_security" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="extra_security20170921130834191" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="marshals_by_position" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews" showFeatureCount="0" open="false">
+      <legendlayer drawingOrder="-1" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Fencing and Cones" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="fencing" showFeatureCount="0" open="true">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="true">
+      <legendlayer drawingOrder="-1" name="fencing" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="fence_groups" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Routes" open="true">
-      <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" name="route_markers" showFeatureCount="0" open="true">
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer drawingOrder="-1" name="route_markers" showFeatureCount="0" checked="Qt::Checked" open="true">
           <filegroup hidden="false" open="true">
-            <legendlayerfile layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" isInOverview="0"/>
+            <legendlayerfile isInOverview="0" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="all_routes" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="all_routes" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="timelapse" showFeatureCount="0" open="false">
+    <legendlayer drawingOrder="-1" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" open="false">
       <filegroup hidden="false" open="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0" isInOverview="0"/>
+        <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Unchecked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="water_tables" showFeatureCount="0" open="true">
+    <legendgroup name="Feeding Stations" checked="Qt::Unchecked" open="true">
+      <legendlayer drawingOrder="-1" name="water_tables" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="water_tables20170921142016467" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels" showFeatureCount="0" open="true">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer drawingOrder="-1" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="mayor" showFeatureCount="0" open="true">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer drawingOrder="-1" name="mayor" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="viplabels" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess" showFeatureCount="0" open="false">
+      <legendlayer drawingOrder="-1" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="residents_access" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="osm_roads" showFeatureCount="1" open="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer drawingOrder="-1" name="osm_roads" showFeatureCount="1" checked="Qt::Checked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="osm_places" showFeatureCount="1" open="true">
+      <legendlayer drawingOrder="-1" name="osm_places" showFeatureCount="1" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="data-comments" showFeatureCount="0" open="true">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer drawingOrder="-1" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m" showFeatureCount="1" open="true">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer drawingOrder="-1" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" open="false">
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Outlines" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="Outlines" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer legendPlaceholderImage="" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -536,7 +536,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" type="raster">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" maxScale="100000" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -601,7 +601,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -612,9 +612,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -626,58 +626,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" zscale="1" band="1" enabled="0" symbology="Line">
+      <elevation band="1" enabled="0" zscale="1" zoffset="0" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -708,36 +708,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -752,9 +752,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -763,27 +763,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="false" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Value" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="false" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Value" type="QString"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer opacity="0.5" redBand="1" greenBand="2" alphaBand="-1" type="multibandcolor" nodataColor="" blueBand="3">
+        <rasterrenderer redBand="1" type="multibandcolor" nodataColor="" blueBand="3" opacity="0.5" alphaBand="-1" greenBand="2">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -794,14 +794,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeBlue="128" colorizeStrength="100" colorizeGreen="128" saturation="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeRed="255" colorizeBlue="128" grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" type="raster">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" maxScale="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -866,7 +866,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -877,7 +877,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -889,58 +889,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" zscale="1" band="1" enabled="0" symbology="Line">
+      <elevation band="1" enabled="0" zscale="1" zoffset="0" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -971,36 +971,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -1015,9 +1015,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1026,27 +1026,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="true" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Undefined" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="true" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Undefined" type="QString"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer opacity="0.75" alphaBand="-1" band="1" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer type="singlebandcolordata" nodataColor="" band="1" opacity="0.75" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1057,14 +1057,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeBlue="128" colorizeStrength="100" colorizeGreen="128" saturation="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeRed="255" colorizeBlue="128" grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1129,7 +1129,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1143,8 +1143,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100" name="length_km" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100 * 1000" name="length_m" length="-1" type="6"/>
+        <field name="length_km" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100" subType="0"/>
+        <field name="length_m" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100 * 1000" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1157,58 +1157,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="RouteLen">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="RouteLen" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1239,36 +1239,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -1283,44 +1283,44 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -1343,59 +1343,59 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" checkstate="0" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule symbol="1" description="This should be disabled, since it's only for legends" checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule symbol="2" description="This should be disabled, since it's only for legends" checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule symbol="3" description="This should be disabled, since it's only for legends" checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule symbol="4" description="This should be disabled, since it's only for legends" checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" label="Active Routes" checkstate="0" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas">
+            <rule key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" label="21KM" checkstate="0" symbol="1" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" label="10KM" checkstate="0" symbol="2" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{bdafe9b2-4918-427d-89be-41870f96981f}" label="5KM" checkstate="0" symbol="3" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{151f553a-04cc-4e24-b74d-37d5618f5223}" label="Trail" checkstate="0" symbol="4" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="5" description="Only show when active in Atlas" label="Show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule symbol="6" description="This should be disabled, since it's only for legends" checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="7" description="This should be disabled, since it's only for legends" checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="8" description="This should be disabled, since it's only for legends" checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule symbol="9" description="This should be disabled, since it's only for legends" checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" symbol="5" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" description="Only show when active in Atlas">
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM" checkstate="0" symbol="6" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM" checkstate="0" symbol="7" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM" checkstate="0" symbol="8" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail" checkstate="0" symbol="9" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="10" checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule symbol="11" checkstate="0" label="Always show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" checkstate="0" symbol="10"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day" checkstate="0" symbol="11" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1415,44 +1415,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@0" force_rhr="0" type="marker">
+              <symbol name="@0@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -1468,32 +1468,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@0@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@0@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -1508,15 +1508,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1524,35 +1524,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1583,36 +1583,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1632,40 +1632,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@2" force_rhr="0" type="marker">
+              <symbol name="@0@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1688,38 +1688,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1739,40 +1739,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@3" force_rhr="0" type="marker">
+              <symbol name="@0@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1795,47 +1795,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1855,44 +1855,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@0" force_rhr="0" type="marker">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -1908,32 +1908,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -1948,15 +1948,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1964,35 +1964,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2023,36 +2023,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2072,40 +2072,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@2" force_rhr="0" type="marker">
+              <symbol name="@1@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2128,38 +2128,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2179,40 +2179,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@3" force_rhr="0" type="marker">
+              <symbol name="@1@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2235,58 +2235,58 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="10" force_rhr="0" type="line">
+          <symbol name="10" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2317,56 +2317,56 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="11" force_rhr="0" type="line">
+          <symbol name="11" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.46" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2397,45 +2397,45 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2455,44 +2455,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@0" force_rhr="0" type="marker">
+              <symbol name="@2@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -2508,32 +2508,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -2548,15 +2548,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2564,35 +2564,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2623,36 +2623,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2672,40 +2672,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@2" force_rhr="0" type="marker">
+              <symbol name="@2@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2728,38 +2728,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2779,40 +2779,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@3" force_rhr="0" type="marker">
+              <symbol name="@2@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2835,47 +2835,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="line">
+          <symbol name="3" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2895,44 +2895,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@0" force_rhr="0" type="marker">
+              <symbol name="@3@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -2948,32 +2948,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@3@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@3@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="145,211,55,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -2988,15 +2988,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3004,35 +3004,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,211,55,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3063,36 +3063,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3112,40 +3112,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@2" force_rhr="0" type="marker">
+              <symbol name="@3@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3168,38 +3168,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3219,40 +3219,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@3" force_rhr="0" type="marker">
+              <symbol name="@3@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3275,47 +3275,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="line">
+          <symbol name="4" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3335,44 +3335,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@4@0" force_rhr="0" type="marker">
+              <symbol name="@4@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -3388,32 +3388,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@4@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@4@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,72,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -3428,15 +3428,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3444,35 +3444,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,72,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3503,36 +3503,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3552,40 +3552,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@4@2" force_rhr="0" type="marker">
+              <symbol name="@4@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3608,38 +3608,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3659,40 +3659,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@4@3" force_rhr="0" type="marker">
+              <symbol name="@4@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3715,47 +3715,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="5" force_rhr="0" type="line">
+          <symbol name="5" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3775,44 +3775,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@5@0" force_rhr="0" type="marker">
+              <symbol name="@5@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -3828,32 +3828,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@5@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@5@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -3868,15 +3868,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3884,35 +3884,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3943,36 +3943,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3992,40 +3992,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@5@2" force_rhr="0" type="marker">
+              <symbol name="@5@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4048,38 +4048,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4099,40 +4099,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@5@3" force_rhr="0" type="marker">
+              <symbol name="@5@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4155,47 +4155,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="6" force_rhr="0" type="line">
+          <symbol name="6" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4215,44 +4215,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@6@0" force_rhr="0" type="marker">
+              <symbol name="@6@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -4268,32 +4268,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@6@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@6@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -4308,15 +4308,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4324,35 +4324,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4383,36 +4383,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4432,40 +4432,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@6@2" force_rhr="0" type="marker">
+              <symbol name="@6@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4488,38 +4488,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4539,40 +4539,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@6@3" force_rhr="0" type="marker">
+              <symbol name="@6@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4595,47 +4595,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="7" force_rhr="0" type="line">
+          <symbol name="7" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4655,44 +4655,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@7@0" force_rhr="0" type="marker">
+              <symbol name="@7@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -4708,32 +4708,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@7@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@7@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -4748,15 +4748,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4764,35 +4764,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4823,36 +4823,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4872,40 +4872,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@7@2" force_rhr="0" type="marker">
+              <symbol name="@7@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4928,38 +4928,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4979,40 +4979,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@7@3" force_rhr="0" type="marker">
+              <symbol name="@7@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5035,47 +5035,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="8" force_rhr="0" type="line">
+          <symbol name="8" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5095,44 +5095,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@8@0" force_rhr="0" type="marker">
+              <symbol name="@8@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -5148,32 +5148,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@8@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@8@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="145,211,55,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -5188,15 +5188,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5204,35 +5204,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,211,55,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5263,36 +5263,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5312,40 +5312,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@8@2" force_rhr="0" type="marker">
+              <symbol name="@8@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5368,38 +5368,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5419,40 +5419,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@8@3" force_rhr="0" type="marker">
+              <symbol name="@8@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5475,47 +5475,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="9" force_rhr="0" type="line">
+          <symbol name="9" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5535,44 +5535,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@9@0" force_rhr="0" type="marker">
+              <symbol name="@9@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -5588,32 +5588,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@9@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@9@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,72,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -5628,15 +5628,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5644,35 +5644,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,72,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5703,36 +5703,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5752,40 +5752,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@9@2" force_rhr="0" type="marker">
+              <symbol name="@9@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5808,38 +5808,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5859,40 +5859,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@9@3" force_rhr="0" type="marker">
+              <symbol name="@9@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5915,15 +5915,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5937,42 +5937,42 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule description="Active routes" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="round($length / 1000, 0)" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="round($length / 1000, 0)" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="164,113,88,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -5995,34 +5995,34 @@
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -6037,98 +6037,98 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="1" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="km_marker()" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+              <placement priority="10" placement="0" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="km_marker()" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="1" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -6137,9 +6137,9 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -6149,7 +6149,7 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -6157,48 +6157,48 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -6229,9 +6229,9 @@
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6239,215 +6239,215 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
       </aliases>
       <defaults>
-        <default field="Name" expression="" applyOnUpdate="0"/>
-        <default field="descriptio" expression="" applyOnUpdate="0"/>
-        <default field="timestamp" expression="" applyOnUpdate="0"/>
-        <default field="begin" expression="" applyOnUpdate="0"/>
-        <default field="end" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
-        <default field="RouteLen" expression="" applyOnUpdate="0"/>
-        <default field="Source" expression="" applyOnUpdate="0"/>
-        <default field="Sort" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
-        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
       </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="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100" name="length_km" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100 * 1000" name="length_m" length="-1" type="6"/>
+        <field name="length_km" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100" subType="0"/>
+        <field name="length_m" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100 * 1000" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
         <columns>
-          <column hidden="0" width="152" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="163" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="188" name="length_m" type="field"/>
-          <column hidden="0" width="-1" name="Sort" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="266" name="length_km" type="field"/>
+          <column name="Name" hidden="0" type="field" width="152"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="163"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="188"/>
+          <column name="Sort" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="266"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6479,32 +6479,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -6525,7 +6525,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6598,58 +6598,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6680,36 +6680,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -6724,44 +6724,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -6784,54 +6784,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="183,72,75,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="183,72,75,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6862,9 +6862,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6875,36 +6875,36 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="ID">
+        <field name="ID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="height">
+        <field name="height" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="elevation">
+        <field name="elevation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -6913,30 +6913,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias name="" index="0" field="ID"/>
+        <alias name="" index="1" field="height"/>
+        <alias name="" index="2" field="elevation"/>
       </aliases>
       <defaults>
-        <default field="ID" expression="" applyOnUpdate="0"/>
-        <default field="height" expression="" applyOnUpdate="0"/>
-        <default field="elevation" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="height" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="elevation" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="ID"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="height"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="elevation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6959,7 +6959,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Polygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7034,58 +7034,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7116,36 +7116,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -7160,44 +7160,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7220,38 +7220,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -7266,9 +7266,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7279,45 +7279,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -7326,34 +7326,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7376,7 +7376,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7441,7 +7441,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7466,58 +7466,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7548,36 +7548,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -7592,44 +7592,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7652,54 +7652,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,85,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,85,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7730,9 +7730,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7743,32 +7743,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="Name" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="Name" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -7783,67 +7783,67 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="2" placement="2" geometryGeneratorType="LineGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="5" placement="2" allowDegraded="0" geometryGeneratorType="LineGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="Name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="Name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -7851,48 +7851,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -7923,9 +7923,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7933,30 +7933,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7965,30 +7965,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Name"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8020,12 +8020,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8033,7 +8033,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8098,7 +8098,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8123,58 +8123,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8205,36 +8205,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -8249,44 +8249,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8309,48 +8309,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule symbol="1" description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule symbol="2" description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas"/>
+          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas"/>
+          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8370,40 +8370,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@0" force_rhr="0" type="marker">
+              <symbol name="@0@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="miter" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="area" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="miter" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="area" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -8426,32 +8426,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8471,44 +8471,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@1" force_rhr="0" type="marker">
+              <symbol name="@0@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -8524,32 +8524,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@0@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@0@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -8564,9 +8564,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8574,35 +8574,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -8633,39 +8633,39 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8685,44 +8685,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@0" force_rhr="0" type="marker">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8738,32 +8738,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8778,9 +8778,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8788,24 +8788,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8825,44 +8825,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@1" force_rhr="0" type="marker">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8878,32 +8878,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8918,9 +8918,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8928,35 +8928,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -8987,39 +8987,39 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9039,44 +9039,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@0" force_rhr="0" type="marker">
+              <symbol name="@2@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9092,32 +9092,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="69,100,25,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="69,100,25,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9132,9 +9132,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9142,24 +9142,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9179,44 +9179,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@1" force_rhr="0" type="marker">
+              <symbol name="@2@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9232,32 +9232,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@2@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@2@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9272,9 +9272,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9282,35 +9282,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="69,100,25,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="69,100,25,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9341,9 +9341,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9355,11 +9355,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9367,48 +9367,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -9439,9 +9439,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9449,65 +9449,65 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Distance"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9539,30 +9539,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9570,7 +9570,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9643,58 +9643,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -9725,36 +9725,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -9769,44 +9769,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9829,46 +9829,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.796078" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="0.796078" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="227,0,185,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="227,0,185,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9891,15 +9891,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9910,34 +9910,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" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -9952,151 +9952,151 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="8" dist="0" placement="1" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="8" placement="1" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="4" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="227,0,185,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="227,0,185,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="4" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.10000000000000001" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10111,89 +10111,89 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="1" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="2" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="2" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -10202,145 +10202,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10348,48 +10348,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10420,9 +10420,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10430,83 +10430,83 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="position" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10582,7 +10582,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Polygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10657,58 +10657,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -10739,36 +10739,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -10783,44 +10783,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10843,38 +10843,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,85,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,85,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,85,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,85,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,85,0,255" k="color"/>
@@ -10889,9 +10889,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10902,13 +10902,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10916,48 +10916,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10988,9 +10988,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10998,64 +10998,64 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="1" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="1" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -11064,50 +11064,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
+        <alias name="" index="5" field="fence_len"/>
       </aliases>
       <defaults>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="group" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
-        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="415" name="name" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
+          <column name="name" hidden="0" type="field" width="415"/>
+          <column name="group" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="cone_len" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="fence_len" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11139,18 +11139,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="fence_len" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="cone_len" reuseLastValue="0"/>
@@ -11164,7 +11164,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11229,7 +11229,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11243,26 +11243,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" length="-1" type="6"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0"/>
+        <field name="cone_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" version="3.8.3-Zanzibar" simplifyAlgorithm="0" maxScale="0" simplifyLocal="1" simplifyDrawingTol="1" styleCategories="AllStyleCategories" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="1e+08" simplifyDrawingHints="1">
+          <qgis simplifyLocal="1" version="3.8.3-Zanzibar" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" readOnly="0" simplifyDrawingHints="1" maxScale="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" type="RuleRenderer">
+            <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol clip_to_extent="1" alpha="1" name="0" force_rhr="0" type="line">
-                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <symbol clip_to_extent="1" name="0" type="line" alpha="1" force_rhr="0">
+                  <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                     <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"/>
@@ -11281,9 +11281,9 @@ def my_form_open(dialog, layer, feature):
                     <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11292,64 +11292,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" namedStyle="Regular" fontLetterSpacing="0" previewBkgrdColor="#ffffff" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontCapitals="0" fieldName="comment" blendMode="0" fontWeight="50" fontStrikeout="0" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" textOpacity="0.8" fontUnderline="0">
-                      <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                      <background shapeOpacity="0.6" shapeBorderWidth="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeRadiiY="1" shapeType="0"/>
-                      <shadow shadowOpacity="0.7" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1"/>
+                    <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" multilineHeight="1" blendMode="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontLetterSpacing="0" fontUnderline="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" fieldName="comment" isExpression="0" fontWeight="50" fontCapitals="0" textOpacity="0.8">
+                      <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeType="0" shapeBorderColor="255,255,0,255" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeJoinStyle="128" shapeOpacity="0.6" shapeRadiiY="1" shapeDraw="1"/>
+                      <shadow shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" addDirectionSymbol="0" wrapChar="" reverseDirectionSymbol="0"/>
-                    <placement maxCurvedCharAngleOut="-25" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" priority="5" geometryGeneratorType="PointGeometry" dist="5" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" placement="4" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetUnits="MM" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" repeatDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleIn="25" centroidWhole="0"/>
-                    <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="1" obstacleType="0" minFeatureSize="0" displayAll="1" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" multilineAlign="4294967295" autoWrapLength="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+                    <placement distUnits="MM" repeatDistanceUnits="MM" yOffset="0" rotationAngle="0" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" centroidWhole="0" priority="5" maxCurvedCharAngleOut="-25" dist="5" geometryGeneratorEnabled="0" quadOffset="4" offsetType="0" maxCurvedCharAngleIn="25" offsetUnits="MM" preserveRotation="1" placement="4" repeatDistance="0"/>
+                    <rendering drawLabels="1" minFeatureSize="0" scaleMin="0" scaleMax="0" obstacle="1" fontMinPixelSize="3" displayAll="1" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="1" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontCapitals="0" fieldName="round( $length, 1) || 'm'" blendMode="0" fontWeight="63" fontStrikeout="0" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" textOpacity="1" fontUnderline="0">
-                      <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                      <background shapeOpacity="1" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeRadiiY="0" shapeType="0"/>
-                      <shadow shadowOpacity="0.7" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1"/>
+                    <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" multilineHeight="1" blendMode="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontLetterSpacing="0" fontUnderline="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" useSubstitutions="0" fieldName="round( $length, 1) || 'm'" isExpression="1" fontWeight="63" fontCapitals="0" textOpacity="1">
+                      <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiY="0" shapeDraw="0"/>
+                      <shadow shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" addDirectionSymbol="0" wrapChar="" reverseDirectionSymbol="0"/>
-                    <placement maxCurvedCharAngleOut="-25" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" priority="5" geometryGeneratorType="PointGeometry" dist="1" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetUnits="MM" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" repeatDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleIn="25" centroidWhole="0"/>
-                    <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" obstacleType="0" minFeatureSize="0" displayAll="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" multilineAlign="4294967295" autoWrapLength="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+                    <placement distUnits="MM" repeatDistanceUnits="MM" yOffset="0" rotationAngle="0" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" centroidWhole="0" priority="5" maxCurvedCharAngleOut="-25" dist="1" geometryGeneratorEnabled="0" quadOffset="4" offsetType="0" maxCurvedCharAngleIn="25" offsetUnits="MM" preserveRotation="1" placement="2" repeatDistance="0"/>
+                    <rendering drawLabels="1" minFeatureSize="0" scaleMin="0" scaleMax="0" obstacle="1" fontMinPixelSize="3" displayAll="0" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11357,30 +11357,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory penAlpha="255" opacity="1" width="15" penColor="#000000" diagramOrientation="Up" barWidth="5" enabled="0" sizeScale="3x:0,0,0,0,0,0" height="15" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" minimumSize="0" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" scaleDependency="Area" minScaleDenominator="0">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute color="#000000" field="" label=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory scaleDependency="Area" height="15" rotationOffset="270" minScaleDenominator="0" opacity="1" labelPlacementMethod="XHeight" backgroundAlpha="255" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute label="" color="#000000" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" zIndex="0">
+            <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -11464,81 +11464,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias name="" index="0" field="id"/>
+              <alias name="" index="1" field="group"/>
+              <alias name="" index="2" field="comment"/>
+              <alias name="" index="3" field="moveable"/>
+              <alias name="" index="4" field="type"/>
+              <alias name="" index="5" field="name"/>
+              <alias name="" index="6" field="hidden"/>
+              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
+              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
+              <alias name="" index="9" field="fence_len"/>
+              <alias name="" index="10" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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"/>
+              <default applyOnUpdate="0" expression="" field="id"/>
+              <default applyOnUpdate="0" expression="" field="group"/>
+              <default applyOnUpdate="0" expression="" field="comment"/>
+              <default applyOnUpdate="0" expression="" field="moveable"/>
+              <default applyOnUpdate="0" expression="" field="type"/>
+              <default applyOnUpdate="0" expression="" field="name"/>
+              <default applyOnUpdate="0" expression="" field="hidden"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
+              <default applyOnUpdate="0" expression="" field="fence_len"/>
+              <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="id"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="group"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="comment"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="moveable"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="type"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="hidden"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="fence_len"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint desc="" field="id" exp=""/>
+              <constraint desc="" field="group" exp=""/>
+              <constraint desc="" field="comment" exp=""/>
+              <constraint desc="" field="moveable" exp=""/>
+              <constraint desc="" field="type" exp=""/>
+              <constraint desc="" field="name" exp=""/>
+              <constraint desc="" field="hidden" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
+              <constraint desc="" field="fence_len" exp=""/>
+              <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" precision="0" typeName="double precision" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" length="-1" type="6"/>
-              <field comment="" precision="0" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" length="-1" type="6"/>
-              <field comment="" precision="0" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" length="-1" type="6"/>
+              <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0"/>
+              <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0"/>
+              <field name="cone_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
               <columns>
-                <column hidden="0" width="-1" name="id" type="field"/>
-                <column hidden="0" width="-1" name="group" type="field"/>
+                <column hidden="0" name="id" width="-1" type="field"/>
+                <column hidden="0" name="group" width="-1" type="field"/>
                 <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" name="comment" type="field"/>
-                <column hidden="0" width="-1" name="moveable" type="field"/>
-                <column hidden="0" width="-1" name="type" type="field"/>
-                <column hidden="0" width="414" name="name" type="field"/>
-                <column hidden="0" width="-1" name="hidden" type="field"/>
-                <column hidden="0" width="-1" name="fence_len" type="field"/>
-                <column hidden="0" width="-1" name="cone_len" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positiony" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positionx" type="field"/>
+                <column hidden="0" name="comment" width="223" type="field"/>
+                <column hidden="0" name="moveable" width="-1" type="field"/>
+                <column hidden="0" name="type" width="-1" type="field"/>
+                <column hidden="0" name="name" width="414" type="field"/>
+                <column hidden="0" name="hidden" width="-1" type="field"/>
+                <column hidden="0" name="fence_len" width="-1" type="field"/>
+                <column hidden="0" name="cone_len" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positiony" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positionx" width="-1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11569,32 +11569,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <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"/>
+              <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"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -11611,58 +11611,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -11693,36 +11693,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -11737,44 +11737,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -11797,64 +11797,64 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0" referencescale="-1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule symbol="3" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Is Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
-          <rule symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Is Visible" checkstate="0" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" checkstate="0" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="1;4" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="Point" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dot" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="1;4" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="Point" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dot" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11885,56 +11885,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="4;3" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="4;3" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11965,56 +11965,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12045,56 +12045,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="line">
+          <symbol name="3" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12125,56 +12125,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="line">
+          <symbol name="4" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12205,50 +12205,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="5" force_rhr="0" type="line">
+          <symbol name="5" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12279,9 +12279,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12290,34 +12290,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{39bfb314-1cf0-4ad7-9317-85df81083977}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{95ff248f-4d20-4914-90b5-ff48b94b38a0}">
+          <rule key="{95ff248f-4d20-4914-90b5-ff48b94b38a0}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="11" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="comment" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.80000000000000004" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="comment" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="0.80000000000000004" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.59999999999999998" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="255,255,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="0.59999999999999998" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="0.59999999999999998" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="255,255,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.6" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="255,255,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.6" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12332,118 +12332,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="4294967295" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="14" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="5" dist="5" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="1" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8200000000000001" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="5" placement="2" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="5" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8200000000000001" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="1" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{ef0e96b4-ef80-4bde-9260-81fbd496b3f7}">
+          <rule key="{ef0e96b4-ef80-4bde-9260-81fbd496b3f7}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="11" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12466,34 +12466,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12508,112 +12508,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="14" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="6" dist="1" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="6" placement="2" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{20c54c85-a61c-42da-a678-6dc9932e9e61}">
+          <rule key="{20c54c85-a61c-42da-a678-6dc9932e9e61}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="11" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12636,34 +12636,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12678,72 +12678,72 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="14" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="6" dist="1" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="6" placement="2" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -12752,13 +12752,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -12766,48 +12766,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -12838,9 +12838,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12848,86 +12848,86 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="comment">
+        <field name="comment" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="moveable">
+        <field name="moveable" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="hidden">
+        <field name="hidden" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12936,74 +12936,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="comment"/>
+        <alias name="" index="3" field="moveable"/>
+        <alias name="" index="4" field="type"/>
+        <alias name="" index="5" field="name"/>
+        <alias name="" index="6" field="hidden"/>
+        <alias name="" index="7" field="day"/>
+        <alias name="" index="8" field="fence_len"/>
+        <alias name="" index="9" field="cone_len"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="group" expression="" applyOnUpdate="0"/>
-        <default field="comment" expression="" applyOnUpdate="0"/>
-        <default field="moveable" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="hidden" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="fence_len" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="comment"/>
+        <default applyOnUpdate="0" expression="" field="moveable"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="hidden"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="comment"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="moveable"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" length="-1" type="6"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0"/>
+        <field name="cone_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="373" name="comment" type="field"/>
-          <column hidden="0" width="-1" name="moveable" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="692" name="name" type="field"/>
-          <column hidden="0" width="-1" name="hidden" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="group" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="comment" hidden="0" type="field" width="373"/>
+          <column name="moveable" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="692"/>
+          <column name="hidden" hidden="0" type="field" width="-1"/>
+          <column name="fence_len" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="cone_len" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13035,34 +13035,34 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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="1" name="day"/>
-        <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"/>
+        <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="day" editable="1"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="comment" reuseLastValue="0"/>
@@ -13081,7 +13081,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13154,58 +13154,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13236,36 +13236,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -13280,44 +13280,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13340,54 +13340,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,178,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,178,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13418,9 +13418,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13431,11 +13431,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13443,48 +13443,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -13515,9 +13515,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13525,23 +13525,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13550,25 +13550,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13600,10 +13600,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13611,7 +13611,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="100000" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13684,58 +13684,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13766,36 +13766,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="213,180,60,255" k="color"/>
@@ -13810,44 +13810,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13870,38 +13870,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="26,0,201,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="dot" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="26,0,201,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="dot" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="26,0,201,255" k="color"/>
@@ -13916,9 +13916,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13929,9 +13929,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -13943,7 +13943,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13951,48 +13951,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14023,9 +14023,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14033,59 +14033,59 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties" type="Map">
               <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+                <Option name="active" value="true" type="bool"/>
+                <Option name="field" value="id" type="QString"/>
+                <Option name="type" value="2" type="int"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -14094,40 +14094,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="page" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="page" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14159,14 +14159,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14174,7 +14174,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -14239,7 +14239,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14250,7 +14250,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join targetFieldName="position" memoryCache="0" editable="0" upsertOnEdit="0" cascadedDelete="0" joinFieldName="position" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" hasCustomPrefix="1">
+        <join customPrefix="csv_" targetFieldName="position" joinFieldName="position" cascadedDelete="0" hasCustomPrefix="1" editable="0" memoryCache="0" dynamicForm="0" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14277,58 +14277,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="id">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="id" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="114,155,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="114,155,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14359,36 +14359,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -14403,44 +14403,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14463,51 +14463,51 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" description="Show in marshal overview" label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule symbol="1" checkstate="0" label="Always show in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule symbol="2" description="Show in marshal overview" checkstate="0" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan" checkstate="0" symbol="1" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" checkstate="0" symbol="2" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.8" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="0.8" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14530,42 +14530,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.8" is_animated="0" name="1" force_rhr="0" type="marker">
+          <symbol name="1" clip_to_extent="1" type="marker" is_animated="0" alpha="0.8" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14588,42 +14588,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.01" is_animated="0" name="2" force_rhr="0" type="marker">
+          <symbol name="2" clip_to_extent="1" type="marker" is_animated="0" alpha="0.01" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14646,9 +14646,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14657,42 +14657,42 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{a69c392f-7c45-4a75-a992-731572d96e04}">
-          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}">
+          <rule key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.10000000000000001" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14715,34 +14715,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14757,118 +14757,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="1" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="2" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="2" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}">
+          <rule key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.10000000000000001" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14891,34 +14891,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14933,110 +14933,110 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="1" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="2" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="2" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </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" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{a55220d0-6cca-4356-8b73-4d8675ee164b}">
+          <rule key="{a55220d0-6cca-4356-8b73-4d8675ee164b}" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.5" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.5" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15051,181 +15051,181 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="8" dist="0" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="5" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="8" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="5" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </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" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}">
+          <rule key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.59999999999999998" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="0.59999999999999998" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.59999999999999998" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15240,181 +15240,181 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="8" dist="0" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="5" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="8" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="5" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}">
+          <rule key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="0.90000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.90000000000000002" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,0,255" k="color"/>
@@ -15429,149 +15429,149 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="0" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="10" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="0" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="10" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -15580,9 +15580,9 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -15593,142 +15593,142 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -15736,48 +15736,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -15808,9 +15808,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15818,132 +15818,132 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="xyposition">
+        <field name="xyposition" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_position">
+        <field name="csv_position" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_club">
+        <field name="csv_club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_firstname">
+        <field name="csv_firstname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_surname">
+        <field name="csv_surname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_days">
+        <field name="csv_days" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_first_runner">
+        <field name="csv_first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_last_runner">
+        <field name="csv_last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_instructions">
+        <field name="csv_instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15952,90 +15952,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_position" index="6" name=""/>
-        <alias field="csv_club" index="7" name=""/>
-        <alias field="csv_firstname" index="8" name=""/>
-        <alias field="csv_surname" index="9" name=""/>
-        <alias field="csv_days" index="10" name=""/>
-        <alias field="csv_first_runner" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="xyposition"/>
+        <alias name="" index="5" field="day"/>
+        <alias name="" index="6" field="csv_position"/>
+        <alias name="" index="7" field="csv_club"/>
+        <alias name="" index="8" field="csv_firstname"/>
+        <alias name="" index="9" field="csv_surname"/>
+        <alias name="" index="10" field="csv_days"/>
+        <alias name="" index="11" field="csv_first_runner"/>
+        <alias name="" index="12" field="csv_last_runner"/>
+        <alias name="" index="13" field="csv_instructions"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="position" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="notes" expression="" applyOnUpdate="0"/>
-        <default field="xyposition" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="csv_position" expression="" applyOnUpdate="0"/>
-        <default field="csv_club" expression="" applyOnUpdate="0"/>
-        <default field="csv_firstname" expression="" applyOnUpdate="0"/>
-        <default field="csv_surname" expression="" applyOnUpdate="0"/>
-        <default field="csv_days" 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"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="notes"/>
+        <default applyOnUpdate="0" expression="" field="xyposition"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="csv_position"/>
+        <default applyOnUpdate="0" expression="" field="csv_club"/>
+        <default applyOnUpdate="0" expression="" field="csv_firstname"/>
+        <default applyOnUpdate="0" expression="" field="csv_surname"/>
+        <default applyOnUpdate="0" expression="" field="csv_days"/>
+        <default applyOnUpdate="0" expression="" field="csv_first_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="notes" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="xyposition" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_club" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_firstname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_surname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_days" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_first_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_last_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_instructions" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="notes"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="xyposition"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_club"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_firstname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_surname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_days"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_first_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_last_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="xyposition" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="csv_position" exp="" desc=""/>
-        <constraint field="csv_club" exp="" desc=""/>
-        <constraint field="csv_firstname" exp="" desc=""/>
-        <constraint field="csv_surname" exp="" desc=""/>
-        <constraint field="csv_days" exp="" desc=""/>
-        <constraint field="csv_first_runner" exp="" desc=""/>
-        <constraint field="csv_last_runner" exp="" desc=""/>
-        <constraint field="csv_instructions" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="notes" exp=""/>
+        <constraint desc="" field="xyposition" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="csv_position" exp=""/>
+        <constraint desc="" field="csv_club" exp=""/>
+        <constraint desc="" field="csv_firstname" exp=""/>
+        <constraint desc="" field="csv_surname" exp=""/>
+        <constraint desc="" field="csv_days" exp=""/>
+        <constraint desc="" field="csv_first_runner" exp=""/>
+        <constraint desc="" field="csv_last_runner" exp=""/>
+        <constraint desc="" field="csv_instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="notes" type="field"/>
-          <column hidden="0" width="-1" name="xyposition" type="field"/>
-          <column hidden="0" width="-1" name="csv_club" type="field"/>
-          <column hidden="0" width="-1" name="csv_first_runner" type="field"/>
-          <column hidden="0" width="-1" name="csv_last_runner" type="field"/>
-          <column hidden="0" width="-1" name="csv_firstname" type="field"/>
-          <column hidden="0" width="-1" name="csv_surname" type="field"/>
-          <column hidden="0" width="-1" name="csv_position" type="field"/>
-          <column hidden="0" width="-1" name="csv_days" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="csv_instructions" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="notes" hidden="0" type="field" width="-1"/>
+          <column name="xyposition" hidden="0" type="field" width="-1"/>
+          <column name="csv_club" hidden="0" type="field" width="-1"/>
+          <column name="csv_first_runner" hidden="0" type="field" width="-1"/>
+          <column name="csv_last_runner" hidden="0" type="field" width="-1"/>
+          <column name="csv_firstname" hidden="0" type="field" width="-1"/>
+          <column name="csv_surname" hidden="0" type="field" width="-1"/>
+          <column name="csv_position" hidden="0" type="field" width="-1"/>
+          <column name="csv_days" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="csv_instructions" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16067,76 +16067,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_email"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_days"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_firstname"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="csv_surname"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_email" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_days" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_firstname" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="csv_surname" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="csv_captain" reuseLastValue="0"/>
@@ -16209,7 +16209,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" wkbType="NoGeometry" refreshOnNotifyMessage="" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" type="vector">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" type="vector" readOnly="0" maxScale="100000" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" geometry="No geometry" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16262,7 +16262,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16290,58 +16290,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -16372,36 +16372,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -16416,44 +16416,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -16476,9 +16476,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16487,142 +16487,142 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="first_name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="first_name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="club">
+        <field name="club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="firstname">
+        <field name="firstname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="surname">
+        <field name="surname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="phone">
+        <field name="phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="email">
+        <field name="email" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain">
+        <field name="captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_phone">
+        <field name="captain_phone" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_email">
+        <field name="captain_email" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="days">
+        <field name="days" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runner">
+        <field name="first_runner" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runner">
+        <field name="last_runner" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="instructions">
+        <field name="instructions" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16631,94 +16631,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="club" index="1" name=""/>
-        <alias field="firstname" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="name" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="captain_email" index="9" name=""/>
-        <alias field="days" index="10" name=""/>
-        <alias field="races" index="11" name=""/>
-        <alias field="first_runner" index="12" name=""/>
-        <alias field="last_runner" index="13" name=""/>
-        <alias field="instructions" index="14" name=""/>
+        <alias name="" index="0" field="position"/>
+        <alias name="" index="1" field="club"/>
+        <alias name="" index="2" field="firstname"/>
+        <alias name="" index="3" field="surname"/>
+        <alias name="" index="4" field="name"/>
+        <alias name="" index="5" field="phone"/>
+        <alias name="" index="6" field="email"/>
+        <alias name="" index="7" field="captain"/>
+        <alias name="" index="8" field="captain_phone"/>
+        <alias name="" index="9" field="captain_email"/>
+        <alias name="" index="10" field="days"/>
+        <alias name="" index="11" field="races"/>
+        <alias name="" index="12" field="first_runner"/>
+        <alias name="" index="13" field="last_runner"/>
+        <alias name="" index="14" field="instructions"/>
       </aliases>
       <defaults>
-        <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="days" 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"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="club"/>
+        <default applyOnUpdate="0" expression="" field="firstname"/>
+        <default applyOnUpdate="0" expression="" field="surname"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="phone"/>
+        <default applyOnUpdate="0" expression="" field="email"/>
+        <default applyOnUpdate="0" expression="" field="captain"/>
+        <default applyOnUpdate="0" expression="" field="captain_phone"/>
+        <default applyOnUpdate="0" expression="" field="captain_email"/>
+        <default applyOnUpdate="0" expression="" field="days"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" expression="" field="first_runner"/>
+        <default applyOnUpdate="0" expression="" field="last_runner"/>
+        <default applyOnUpdate="0" expression="" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint field="position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="club" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="firstname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="surname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="phone" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="email" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_phone" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_email" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="days" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="instructions" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="club"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="firstname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="surname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="email"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain_phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain_email"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="days"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="firstname" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="captain_email" exp="" desc=""/>
-        <constraint field="days" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="club" exp=""/>
+        <constraint desc="" field="firstname" exp=""/>
+        <constraint desc="" field="surname" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="phone" exp=""/>
+        <constraint desc="" field="email" exp=""/>
+        <constraint desc="" field="captain" exp=""/>
+        <constraint desc="" field="captain_phone" exp=""/>
+        <constraint desc="" field="captain_email" exp=""/>
+        <constraint desc="" field="days" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="221" name="name" type="field"/>
-          <column hidden="0" width="-1" name="club" type="field"/>
-          <column hidden="0" width="-1" name="phone" type="field"/>
-          <column hidden="0" width="-1" name="email" type="field"/>
-          <column hidden="0" width="-1" name="captain" type="field"/>
-          <column hidden="0" width="-1" name="races" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="first_runner" type="field"/>
-          <column hidden="0" width="-1" name="last_runner" type="field"/>
-          <column hidden="0" width="-1" name="instructions" type="field"/>
-          <column hidden="0" width="-1" name="firstname" type="field"/>
-          <column hidden="0" width="-1" name="surname" type="field"/>
-          <column hidden="0" width="-1" name="captain_phone" type="field"/>
-          <column hidden="0" width="-1" name="captain_email" type="field"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="221"/>
+          <column name="club" hidden="0" type="field" width="-1"/>
+          <column name="phone" hidden="0" type="field" width="-1"/>
+          <column name="email" hidden="0" type="field" width="-1"/>
+          <column name="captain" hidden="0" type="field" width="-1"/>
+          <column name="races" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="first_runner" hidden="0" type="field" width="-1"/>
+          <column name="last_runner" hidden="0" type="field" width="-1"/>
+          <column name="instructions" hidden="0" type="field" width="-1"/>
+          <column name="firstname" hidden="0" type="field" width="-1"/>
+          <column name="surname" hidden="0" type="field" width="-1"/>
+          <column name="captain_phone" hidden="0" type="field" width="-1"/>
+          <column name="captain_email" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16750,42 +16750,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16793,7 +16793,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16858,7 +16858,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16883,58 +16883,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="141,90,153,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="141,90,153,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -16965,36 +16965,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="141,90,153,255" k="color"/>
@@ -17009,44 +17009,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17069,58 +17069,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17151,50 +17151,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -17225,30 +17225,30 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -17268,33 +17268,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@1" force_rhr="0" type="marker">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -17310,32 +17310,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -17350,9 +17350,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17365,11 +17365,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -17377,48 +17377,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -17449,9 +17449,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17459,30 +17459,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17491,30 +17491,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17546,12 +17546,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17559,7 +17559,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17624,7 +17624,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17649,58 +17649,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="232,113,141,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="232,113,141,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17731,36 +17731,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="232,113,141,255" k="color"/>
@@ -17775,44 +17775,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17835,44 +17835,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8.5" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="name" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.75" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8.5" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="name" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="0.75" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1.5" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1.5" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -17887,109 +17887,109 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties" type="Map">
                   <Option name="LabelRotation" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                   <Option name="PositionX" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_x" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_x" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
                   <Option name="PositionY" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_y" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_y" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="2" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="1" dist="0" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="0.20000000000000001" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="1" placement="6" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="0.20000000000000001" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;name&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;name&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -17997,48 +17997,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18069,9 +18069,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18079,173 +18079,173 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="osm_id"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="type"/>
+        <alias name="" index="4" field="z_order"/>
+        <alias name="" index="5" field="population"/>
+        <alias name="" index="6" field="label_x"/>
+        <alias name="" index="7" field="label_y"/>
+        <alias name="" index="8" field="label_rota"/>
       </aliases>
       <defaults>
-        <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"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="population"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="population" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="population"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="population" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="0" width="-1" name="population" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="osm_id" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="z_order" hidden="0" type="field" width="-1"/>
+          <column name="population" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="label_x" hidden="0" type="field" width="-1"/>
+          <column name="label_y" hidden="0" type="field" width="-1"/>
+          <column name="label_rota" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18277,26 +18277,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18304,7 +18304,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18369,7 +18369,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18394,58 +18394,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,158,23,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,158,23,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -18476,36 +18476,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,158,23,255" k="color"/>
@@ -18520,44 +18520,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -18580,52 +18580,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="7" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.80000000000000004" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="7" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="50" textOpacity="0.80000000000000004" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="0"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="196,60,57,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="196,60,57,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -18648,34 +18648,34 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -18690,106 +18690,106 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MapUnit" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="4" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="3" dist="0" placement="3" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="1" drawLabels="1" unplacedVisibility="0" obstacleFactor="0.29999999999999999" obstacleType="0" minFeatureSize="5" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="3" placement="3" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="4" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MapUnit" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="1" minFeatureSize="5" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="0.29999999999999999" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="1" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="AlwaysShow" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="always_sho" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="always_sho" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="IsObstacle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="&quot;&quot;" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="&quot;&quot;" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="Priority" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
                 <Option name="Show" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="auxiliary_storage_labeling_show" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -18801,7 +18801,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -18809,48 +18809,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18881,9 +18881,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18891,137 +18891,137 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="highway">
+        <field name="highway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="waterway">
+        <field name="waterway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="aerialway">
+        <field name="aerialway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="barrier">
+        <field name="barrier" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="man_made">
+        <field name="man_made" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="other_tags">
+        <field name="other_tags" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="never_show">
+        <field name="never_show" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="always_sho">
+        <field name="always_sho" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="resident_a">
+        <field name="resident_a" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
+        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -19030,100 +19030,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias name="" index="0" field="osm_id"/>
+        <alias name="" index="1" field="name"/>
+        <alias name="" index="2" field="highway"/>
+        <alias name="" index="3" field="waterway"/>
+        <alias name="" index="4" field="aerialway"/>
+        <alias name="" index="5" field="barrier"/>
+        <alias name="" index="6" field="man_made"/>
+        <alias name="" index="7" field="z_order"/>
+        <alias name="" index="8" field="other_tags"/>
+        <alias name="" index="9" field="never_show"/>
+        <alias name="" index="10" field="label_x"/>
+        <alias name="" index="11" field="label_y"/>
+        <alias name="" index="12" field="label_rota"/>
+        <alias name="" index="13" field="always_sho"/>
+        <alias name="" index="14" field="resident_a"/>
+        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <defaults>
-        <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"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="highway"/>
+        <default applyOnUpdate="0" expression="" field="waterway"/>
+        <default applyOnUpdate="0" expression="" field="aerialway"/>
+        <default applyOnUpdate="0" expression="" field="barrier"/>
+        <default applyOnUpdate="0" expression="" field="man_made"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="other_tags"/>
+        <default applyOnUpdate="0" expression="" field="never_show"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="always_sho"/>
+        <default applyOnUpdate="0" expression="" field="resident_a"/>
+        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="highway" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="waterway" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="aerialway" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="barrier" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="man_made" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="other_tags" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="never_show" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="always_sho" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="resident_a" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="highway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="waterway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="aerialway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="barrier"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="man_made"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="other_tags"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="never_show"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="always_sho"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="resident_a"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_show"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="highway" exp=""/>
+        <constraint desc="" field="waterway" exp=""/>
+        <constraint desc="" field="aerialway" exp=""/>
+        <constraint desc="" field="barrier" exp=""/>
+        <constraint desc="" field="man_made" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="other_tags" exp=""/>
+        <constraint desc="" field="never_show" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" field="always_sho" exp=""/>
+        <constraint desc="" field="resident_a" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="160" name="name" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="highway" type="field"/>
-          <column hidden="0" width="-1" name="waterway" type="field"/>
-          <column hidden="0" width="-1" name="aerialway" type="field"/>
-          <column hidden="0" width="-1" name="barrier" type="field"/>
-          <column hidden="0" width="-1" name="man_made" type="field"/>
-          <column hidden="0" width="142" name="other_tags" type="field"/>
-          <column hidden="0" width="-1" name="never_show" type="field"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
-          <column hidden="0" width="-1" name="always_sho" type="field"/>
-          <column hidden="0" width="-1" name="resident_a" type="field"/>
-          <column hidden="0" width="-1" name="auxiliary_storage_labeling_show" type="field"/>
+          <column name="osm_id" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="160"/>
+          <column name="z_order" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="highway" hidden="0" type="field" width="-1"/>
+          <column name="waterway" hidden="0" type="field" width="-1"/>
+          <column name="aerialway" hidden="0" type="field" width="-1"/>
+          <column name="barrier" hidden="0" type="field" width="-1"/>
+          <column name="man_made" hidden="0" type="field" width="-1"/>
+          <column name="other_tags" hidden="0" type="field" width="142"/>
+          <column name="never_show" hidden="0" type="field" width="-1"/>
+          <column name="label_x" hidden="0" type="field" width="-1"/>
+          <column name="label_y" hidden="0" type="field" width="-1"/>
+          <column name="label_rota" hidden="0" type="field" width="-1"/>
+          <column name="always_sho" hidden="0" type="field" width="-1"/>
+          <column name="resident_a" hidden="0" type="field" width="-1"/>
+          <column name="auxiliary_storage_labeling_show" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19155,76 +19155,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="aerialway" reuseLastValue="0"/>
@@ -19292,7 +19292,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="0" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19357,7 +19357,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19382,58 +19382,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="231,113,72,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="231,113,72,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -19464,36 +19464,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="231,113,72,255" k="color"/>
@@ -19508,44 +19508,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19568,54 +19568,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1" filter="&quot;type&quot; = 'toilets'"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2" filter="&quot;type&quot; = 'togbag'"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3" filter=" &quot;type&quot; = 'closure'"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4" filter="&quot;type&quot; = 'myciti'"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="star" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.5" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="name" value="star" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.5" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19638,47 +19638,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="marker">
+          <symbol name="1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,32,80,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="amenity/amenity_toilets.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,32,80,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="amenity/amenity_toilets.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,32,80,255" k="color"/>
@@ -19700,47 +19700,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="marker">
+          <symbol name="2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/gym-bag.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/gym-bag.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
@@ -19762,57 +19762,57 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="marker">
+          <symbol name="3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/road_closure.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/road_closure.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="125,139,143,255" k="color"/>
@@ -19834,47 +19834,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="marker">
+          <symbol name="4" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,12,254,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/transport_bus_stop.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="255,255,255,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,12,254,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/transport_bus_stop.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="255,255,255,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
@@ -19894,21 +19894,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
               <prop v="MM" k="size_unit"/>
               <prop v="1" k="vertical_anchor_point"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -19925,24 +19925,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -19965,10 +19965,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -19977,18 +19977,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20005,24 +20005,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20046,47 +20046,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="5" force_rhr="0" type="marker">
+          <symbol name="5" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="43,153,41,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/amenity=parking.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="43,153,41,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/amenity=parking.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
@@ -20108,15 +20108,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20125,32 +20125,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="name" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="name" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="2" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="0.69999999999999996" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="2" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="2">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="2" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="0"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="2" shapeOpacity="0.69999999999999996" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -20165,99 +20165,99 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties" type="Map">
                   <Option name="LabelDistance" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                   <Option name="OffsetQuad" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="2" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="2" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="3" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="2" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="3" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="10" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="10" placement="0" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="2" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="3" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="2" yOffset="3" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="10" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="LabelDistance" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="OffsetQuad" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="2" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="2" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20265,48 +20265,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -20337,9 +20337,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20347,44 +20347,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20393,40 +20393,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="distance"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20458,16 +20458,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20475,7 +20475,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20548,58 +20548,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -20630,36 +20630,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -20674,44 +20674,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20734,42 +20734,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
+            <layer enabled="1" class="LinePatternFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="135" name="angle" type="QString"/>
-                <Option value="during_render" name="clip_mode" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="feature" name="coordinate_reference" type="QString"/>
-                <Option value="2" name="distance" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="distance_map_unit_scale" type="QString"/>
-                <Option value="MM" name="distance_unit" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="135" type="QString"/>
+                <Option name="clip_mode" value="during_render" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="coordinate_reference" value="feature" type="QString"/>
+                <Option name="distance" value="2" type="QString"/>
+                <Option name="distance_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="distance_unit" value="MM" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
               </Option>
               <prop v="135" k="angle"/>
               <prop v="during_render" k="clip_mode"/>
@@ -20788,48 +20788,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@0" force_rhr="0" type="line">
+              <symbol name="@0@0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="align_dash_pattern" type="QString"/>
-                    <Option value="square" name="capstyle" type="QString"/>
-                    <Option value="5;2" name="customdash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="customdash_unit" type="QString"/>
-                    <Option value="0" name="dash_pattern_offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                    <Option value="0" name="draw_inside_polygon" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="211,134,33,255" name="line_color" type="QString"/>
-                    <Option value="solid" name="line_style" type="QString"/>
-                    <Option value="0.3" name="line_width" type="QString"/>
-                    <Option value="MM" name="line_width_unit" type="QString"/>
-                    <Option value="0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0" name="ring_filter" type="QString"/>
-                    <Option value="0" name="trim_distance_end" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                    <Option value="0" name="trim_distance_start" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                    <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                    <Option value="0" name="use_custom_dash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                    <Option name="align_dash_pattern" value="0" type="QString"/>
+                    <Option name="capstyle" value="square" type="QString"/>
+                    <Option name="customdash" value="5;2" type="QString"/>
+                    <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="customdash_unit" value="MM" type="QString"/>
+                    <Option name="dash_pattern_offset" value="0" type="QString"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                    <Option name="draw_inside_polygon" value="0" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="line_color" value="211,134,33,255" type="QString"/>
+                    <Option name="line_style" value="solid" type="QString"/>
+                    <Option name="line_width" value="0.3" type="QString"/>
+                    <Option name="line_width_unit" value="MM" type="QString"/>
+                    <Option name="offset" value="0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="ring_filter" value="0" type="QString"/>
+                    <Option name="trim_distance_end" value="0" type="QString"/>
+                    <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                    <Option name="trim_distance_start" value="0" type="QString"/>
+                    <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                    <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                    <Option name="use_custom_dash" value="0" type="QString"/>
+                    <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
                   <prop v="0" k="align_dash_pattern"/>
                   <prop v="square" k="capstyle"/>
@@ -20860,27 +20860,27 @@ def my_form_open(dialog, layer, feature):
                   <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.46" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="no" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.46" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="no" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="211,134,33,255" k="color"/>
@@ -20895,9 +20895,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20908,11 +20908,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20920,48 +20920,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -20992,9 +20992,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21002,23 +21002,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="1" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="1" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -21027,26 +21027,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <defaults>
-        <default field="FID" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="FID"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="431" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21078,12 +21078,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21091,7 +21091,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21156,7 +21156,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21181,58 +21181,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,207,80,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,207,80,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21263,36 +21263,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,207,80,255" k="color"/>
@@ -21307,44 +21307,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -21367,61 +21367,61 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0" filter="&quot;status&quot; = 'open'"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3" filter="&quot;status&quot; = 'one-way'"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21452,50 +21452,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="2" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="2" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21515,40 +21515,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@0" force_rhr="0" type="marker">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,255,0,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="1" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,255,0,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="1" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21571,52 +21571,52 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="2;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash dot dot" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="2;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash dot dot" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21647,41 +21647,41 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21701,46 +21701,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@1" force_rhr="0" type="marker">
+              <symbol name="@2@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21763,58 +21763,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="line">
+          <symbol name="3" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="3;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="3;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21845,41 +21845,41 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21899,46 +21899,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@1" force_rhr="0" type="marker">
+              <symbol name="@3@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21961,58 +21961,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="line">
+          <symbol name="4" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22043,20 +22043,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22065,32 +22065,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="9" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="times" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="9" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="times" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="1" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -22105,67 +22105,67 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="4294967295" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="0" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="5" placement="2" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -22173,48 +22173,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -22245,9 +22245,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22255,44 +22255,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="status">
+        <field name="status" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="times">
+        <field name="times" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -22301,40 +22301,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="status"/>
+        <alias name="" index="3" field="times"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="status" expression="" applyOnUpdate="0"/>
-        <default field="times" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="status" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="times" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="status"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="times"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="202" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="status" type="field"/>
-          <column hidden="0" width="-1" name="times" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="status" hidden="0" type="field" width="-1"/>
+          <column name="times" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22366,16 +22366,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22383,7 +22383,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -22456,58 +22456,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22538,36 +22538,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -22582,44 +22582,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -22642,54 +22642,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{4da76d50-b431-43d2-8f08-7664d5762a1c}">
-          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" key="{f3d8c637-3bb6-4249-ba55-f0c57bee5e55}">
+          <rule key="{f3d8c637-3bb6-4249-ba55-f0c57bee5e55}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22712,34 +22712,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -22754,138 +22754,138 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{839f054f-e86d-4118-a253-e1d5c81234fa}">
+          <rule key="{839f054f-e86d-4118-a253-e1d5c81234fa}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22908,34 +22908,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -22950,131 +22950,131 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{905e8a77-980c-42e8-94ac-662ad263ccb8}">
-            <rule description="21KM" active="0" filter="&quot;Source&quot; = '21KM'" key="{9ed61d0c-920f-41ee-848c-d0202cb5c55a}">
+          <rule key="{905e8a77-980c-42e8-94ac-662ad263ccb8}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0">
+            <rule key="{9ed61d0c-920f-41ee-848c-d0202cb5c55a}" filter="&quot;Source&quot; = '21KM'" description="21KM" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="210,32,39,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="210,32,39,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="210,32,39,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="210,32,39,255" k="color"/>
@@ -23089,130 +23089,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" active="0" filter="&quot;Source&quot; = '10KM'" key="{b1e8ae3d-36ba-4724-a299-5faba67854ef}">
+            <rule key="{b1e8ae3d-36ba-4724-a299-5faba67854ef}" filter="&quot;Source&quot; = '10KM'" description="10KM" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="103,34,144,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="103,34,144,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="103,34,144,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="103,34,144,255" k="color"/>
@@ -23227,130 +23227,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" active="0" filter="&quot;Source&quot; = '5KM'" key="{6e7154e1-bcb8-4b17-8bf0-66341d4599dd}">
+            <rule key="{6e7154e1-bcb8-4b17-8bf0-66341d4599dd}" filter="&quot;Source&quot; = '5KM'" description="5KM" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="145,211,55,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="145,211,55,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="145,211,55,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="145,211,55,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="145,211,55,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="145,211,55,255" k="color"/>
@@ -23365,138 +23365,138 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" active="0" filter="&quot;Source&quot; = 'Trail'" key="{d4116bb5-e30d-46f8-be72-731e74a92758}">
+            <rule key="{d4116bb5-e30d-46f8-be72-731e74a92758}" filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="145,211,55,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                      <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="133,182,111,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" name="name" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" name="outline_width" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="diameter" name="scale_method" type="QString"/>
-                          <Option value="2" name="size" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="size_unit" type="QString"/>
-                          <Option value="1" name="vertical_anchor_point" type="QString"/>
+                          <Option name="angle" value="0" type="QString"/>
+                          <Option name="cap_style" value="square" type="QString"/>
+                          <Option name="color" value="133,182,111,255" type="QString"/>
+                          <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                          <Option name="joinstyle" value="bevel" type="QString"/>
+                          <Option name="name" value="circle" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="0" type="QString"/>
+                          <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="scale_method" value="diameter" type="QString"/>
+                          <Option name="size" value="2" type="QString"/>
+                          <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="size_unit" value="MM" type="QString"/>
+                          <Option name="vertical_anchor_point" value="1" type="QString"/>
                         </Option>
                         <prop v="0" k="angle"/>
                         <prop v="square" k="cap_style"/>
@@ -23519,34 +23519,34 @@ def my_form_open(dialog, layer, feature):
                         <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="0,72,255,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="0,72,255,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="0,72,255,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="0,72,255,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="0,72,255,255" k="color"/>
@@ -23561,77 +23561,77 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
@@ -23641,13 +23641,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -23655,48 +23655,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -23727,9 +23727,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23737,157 +23737,157 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="quadrant">
+        <field name="quadrant" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -23896,95 +23896,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
+        <alias name="" index="12" field="org_fid"/>
+        <alias name="" index="13" field="distance"/>
+        <alias name="" index="14" field="quadrant"/>
       </aliases>
       <defaults>
-        <default field="Name" expression="" applyOnUpdate="0"/>
-        <default field="descriptio" expression="" applyOnUpdate="0"/>
-        <default field="timestamp" expression="" applyOnUpdate="0"/>
-        <default field="begin" expression="" applyOnUpdate="0"/>
-        <default field="end" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
-        <default field="RouteLen" expression="" applyOnUpdate="0"/>
-        <default field="Source" expression="" applyOnUpdate="0"/>
-        <default field="Sort" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
-        <default field="length_m" expression="" applyOnUpdate="0"/>
-        <default field="org_fid" expression="" applyOnUpdate="0"/>
-        <default field="distance" expression="" applyOnUpdate="0"/>
-        <default field="quadrant" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="quadrant"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="quadrant" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="quadrant"/>
       </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="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="quadrant" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="Sort" type="field"/>
-          <column hidden="0" width="-1" name="quadrant" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="-1"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="Sort" hidden="0" type="field" width="-1"/>
+          <column name="quadrant" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24016,38 +24016,38 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -24071,7 +24071,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24144,58 +24144,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24226,36 +24226,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -24270,44 +24270,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24330,38 +24330,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -24376,9 +24376,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24389,39 +24389,39 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="area">
+        <field name="area" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="rotation">
+        <field name="rotation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -24430,35 +24430,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="area"/>
+        <alias name="" index="2" field="rotation"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="area" expression="" applyOnUpdate="0"/>
-        <default field="rotation" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="area" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="rotation" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="area"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="rotation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="area" exp=""/>
+        <constraint desc="" field="rotation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="area" type="field"/>
-          <column hidden="0" width="-1" name="rotation" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="area" hidden="0" type="field" width="-1"/>
+          <column name="rotation" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24481,7 +24481,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="0" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24546,7 +24546,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24571,58 +24571,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24653,36 +24653,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -24697,44 +24697,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24757,49 +24757,49 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" checkstate="0" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24822,20 +24822,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24847,15 +24847,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="StringList">
             <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" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -24863,48 +24863,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -24935,9 +24935,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24945,116 +24945,116 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
+        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
+        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runn">
+        <field name="first_runn" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runne">
+        <field name="last_runne" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25063,85 +25063,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="RouteLen"/>
+        <alias name="" index="6" field="Source"/>
+        <alias name="" index="7" field="length_m"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="org_fid"/>
+        <alias name="" index="10" field="distance"/>
+        <alias name="" index="11" field="first_runn"/>
+        <alias name="" index="12" field="last_runne"/>
       </aliases>
       <defaults>
-        <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"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="first_runn"/>
+        <default applyOnUpdate="0" expression="" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runn" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runne" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runn"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runne"/>
       </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="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=""/>
-        <constraint field="first_runn" exp="" desc=""/>
-        <constraint field="last_runne" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="first_runn" exp=""/>
+        <constraint desc="" field="last_runne" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="179" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="first_runn" type="field"/>
-          <column hidden="0" width="-1" name="last_runne" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column name="begin" hidden="0" type="field" width="179"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="first_runn" hidden="0" type="field" width="-1"/>
+          <column name="last_runne" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25173,58 +25173,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runne"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25232,7 +25232,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25305,58 +25305,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25387,36 +25387,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -25431,44 +25431,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25491,58 +25491,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25573,50 +25573,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -25647,30 +25647,30 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -25690,33 +25690,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@1" force_rhr="0" type="marker">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -25732,32 +25732,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -25772,9 +25772,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -25787,11 +25787,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -25799,48 +25799,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25871,9 +25871,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25881,30 +25881,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25913,30 +25913,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25968,12 +25968,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25981,7 +25981,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="0" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26054,58 +26054,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26136,36 +26136,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -26180,44 +26180,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26240,44 +26240,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="15" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="label" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="15" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="label" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -26292,66 +26292,66 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="0" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="5" placement="0" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -26359,48 +26359,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -26431,9 +26431,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26441,30 +26441,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -26473,30 +26473,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="label"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="label" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="label" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26528,12 +26528,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -26541,7 +26541,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -26606,7 +26606,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -26631,58 +26631,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26713,36 +26713,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -26757,44 +26757,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26817,54 +26817,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8" namedStyle="Bold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="31,120,180,255" legendString="Aa" useSubstitutions="0" fieldName="label" blendMode="0" fontWeight="75" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Bold" textColor="31,120,180,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="label" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="75" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="0.75" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.75" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.75" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0.5" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeDraw="1" shapeFillColor="255,255,255,204" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0.5">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="0.75" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="31,120,206,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeBorderWidth="0.75" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0.5" shapeOpacity="0.59999999999999998" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -26887,34 +26887,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,204" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="31,120,206,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.75" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,204" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="31,120,206,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.75" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,204" k="color"/>
@@ -26929,56 +26929,56 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="PolygonGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="1" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="0" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="5" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="0.76000000000000001" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="6" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="5" placement="0" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="1" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PolygonGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="1" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="1" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="0.76000000000000001" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="5" maxNumLabels="6" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -26987,16 +26987,16 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <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 value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -27004,48 +27004,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27076,9 +27076,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27086,66 +27086,66 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27154,45 +27154,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="table_set"/>
+        <alias name="" index="2" field="label"/>
+        <alias name="" index="3" field="races"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="table_set" expression="" applyOnUpdate="0"/>
-        <default field="label" expression="" applyOnUpdate="0"/>
-        <default field="races" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="table_set"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="table_set" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="table_set"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="table_set" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="130" name="races" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="table_set" hidden="0" type="field" width="-1"/>
+          <column name="label" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="races" hidden="0" type="field" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27224,18 +27224,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="day" reuseLastValue="0"/>
@@ -27444,7 +27444,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan/Gun Run 2022 - Marshal Plan rev 3.2.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27606,274 +27606,274 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" name="name" type="QString"/>
+      <Option name="name" value="" type="QString"/>
       <Option name="properties"/>
-      <Option value="collection" name="type" type="QString"/>
+      <Option name="type" value="collection" type="QString"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Elevation"/>
-        <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 visible="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" style="default" id="water_tables20170921142016467" expanded="1"/>
+    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <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="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" style="default" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" style="default" id="water_tables20170921142016467" expanded="1"/>
+    <visibility-preset name="Marshal overview" has-checked-group-info="1" has-expanded-info="1">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{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>
       <checked-group-nodes>
         <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" style="default" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" style="default" id="water_tables20170921142016467" expanded="1"/>
+    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="water_tables20170921142016467" expanded="1"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1"/>
+      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -27900,31 +27900,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshals">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Marshals" worldFileMap="" units="mm" printResolution="120">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -27939,49 +27939,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -27996,9 +27996,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28006,15 +28006,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" groupUuid="" positionOnPage="110.353,5.04491,mm" symbolWidth="7" position="110.353,5.04491,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="bevel" size="39.4312,46.1,mm" fontColor="#000000" zValue="5" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" splitLayer="0" outlineWidthM="0.1,mm" resizeToContents="1" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="128" red="128" green="128"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="bevel" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="39.4312,46.1,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="5" wmsLegendHeight="25" title="" type="65642" position="110.353,5.04491,mm" outlineWidthM="0.1,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" positionOnPage="110.353,5.04491,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="128" red="128" blue="128" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28022,48 +28022,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="1" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Unchecked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" source="./fencing.shp|layername=fencing" expanded="1" name="fencing" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="0,1,2" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/node-order" value="0,1,2" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28071,15 +28071,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="56.5192,54.5647,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Marshal map - inset" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="4" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" excludeFromExports="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionOnPage="98.7828,149.027,mm" followPreset="true" keepLayerSet="false" position="98.7828,149.027,mm" outlineWidthM="0.2,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" keepLayerSet="false" mapRotation="0" blendMode="0" size="56.5192,54.5647,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" outlineWidthM="0.2,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal map - inset" referencePoint="0" isTemporal="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionOnPage="98.7828,149.027,mm" visibility="1" id="" position="98.7828,149.027,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28088,45 +28088,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41064302246786966" xmax="18.41493455420295433" ymax="-33.89902512102636223" ymin="-33.90316824413850583"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28157,44 +28157,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28217,40 +28217,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28265,29 +28265,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28295,28 +28295,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" centered="1" name="Overview 1" position="3" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" show="1">
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <ComposerMapOverview name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" show="1" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" blendMode="0" centered="1">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,65,170,127" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,102" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,65,170,127" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,102" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,65,170,127" k="color"/>
@@ -28331,9 +28331,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28341,9 +28341,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28351,22 +28351,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="142,187.018,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="false" followPresetName="Marshal map - main" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="3" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" excludeFromExports="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionOnPage="3.53,6.0007,mm" followPreset="true" keepLayerSet="false" position="3.53,6.0007,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" keepLayerSet="false" mapRotation="0" blendMode="0" size="142,187.018,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal map - main" referencePoint="0" isTemporal="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionOnPage="3.53,6.0007,mm" visibility="1" id="" position="3.53,6.0007,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="false" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28375,45 +28375,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41227535330844844" xmax="18.41330222336237554" ymax="-33.90042047455022356" ymin="-33.9017728906146445"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28444,44 +28444,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28504,40 +28504,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28552,29 +28552,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28582,22 +28582,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="142.117,187.018,mm" opacity="1" frameJoinStyle="round" background="false" visibility="1" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" referencePoint="2" type="65647" sectionY="0" frame="false" id="" sectionX="0" zValue="2" sectionHeight="182.4" groupUuid="" blendMode="0" hidePageIfEmpty="0" itemRotation="0" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" excludeFromExports="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionOnPage="290.617,6.0007,mm" position="290.617,6.0007,mm" outlineWidthM="0.3,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
-        <FrameColor alpha="255" blue="119" red="119" green="119"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" sectionWidth="142.117" sectionX="0" sectionHeight="182.4" blendMode="0" size="142.117,187.018,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" outlineWidthM="0.3,mm" opacity="1" hideBackgroundIfEmpty="0" referencePoint="2" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionY="0" positionOnPage="290.617,6.0007,mm" hidePageIfEmpty="0" visibility="1" id="" position="290.617,6.0007,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65647" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="119" red="119" blue="119" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28605,21 +28605,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="47.1065,27.6,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="0" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="27.4317" zValue="1" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionOnPage="246.665,178.41,mm" position="246.665,178.41,mm" outlineWidthM="0.3,mm" pictureHeight="27.6">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" pictureWidth="27.4317" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="47.1065,27.6,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="27.6" referencePoint="0" pictureRotation="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionOnPage="246.665,178.41,mm" visibility="1" id="" northMode="0" position="246.665,178.41,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="0" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28627,14 +28627,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" stylesheetEnabled="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;}" 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>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" url="" evaluateExpressions="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" contentMode="1" type="65648" maxBreakDistance="12">
-        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame maxBreakDistance="12" 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" url="" evaluateExpressions="true" useSmartBreaks="true" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" 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;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true">
+        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28644,53 +28644,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="rasterize" type="QString"/>
-          <Option value="3.53" name="resizeToContentsBottomMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsLeftMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsRightMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsTopMargin" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropMarginUnit" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="rasterize" value="false" type="QString"/>
+          <Option name="resizeToContentsBottomMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsLeftMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsRightMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsTopMargin" value="3.53" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" coverageLayerProvider="ogr" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" sortFeatures="1" sortKey="position" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" pageNameExpression="&quot;position&quot;"/>
+      <Atlas coverageLayerName="marshal_positions" hideCoverage="0" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;position&quot;" 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;" sortKey="position" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="300" worldFileMap="" name="Start &amp; Finish Backgrounds">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" worldFileMap="" units="mm" printResolution="300">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28705,49 +28705,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28762,9 +28762,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28772,21 +28772,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="true" pictureRotation="330" size="9.45865,11,mm" opacity="1" file="arrows/NorthArrow_11.svg" frameJoinStyle="miter" anchorPoint="0" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="6.31767" zValue="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" excludeFromExports="0" mode="0" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionOnPage="286.027,2,mm" position="286.027,2,mm" outlineWidthM="0.3,mm" pictureHeight="7.97477">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="6.31767" northOffset="0" mode="0" blendMode="0" svgBorderWidth="0.2" size="9.45865,11,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="7.97477" referencePoint="0" pictureRotation="330" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionOnPage="286.027,2,mm" visibility="1" id="" northMode="0" position="286.027,2,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="0" background="false" positionLock="true" file="arrows/NorthArrow_11.svg" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28794,47 +28794,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="142.543,10.3185,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="3" groupUuid="" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" itemRotation="270" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionOnPage="285.027,205.886,mm" position="285.027,205.886,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="270" zValue="3" halign="1" blendMode="0" size="142.543,10.3185,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionOnPage="285.027,205.886,mm" visibility="1" id="" position="285.027,205.886,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -28849,65 +28849,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" labelBarSpace="3" alignment="0" type="65646" positionLock="true" maxBarWidth="150" labelHorizontalPlacement="0" opacity="1" outlineWidth="0.3" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" groupUuid="" positionOnPage="7,189.669,mm" lineCapStyle="square" numSubdivisions="1" position="7,189.669,mm" excludeFromExports="0" itemRotation="0" style="Single Box" segmentMillimeters="26.3519" visibility="1" boxContentSpace="1" blendMode="0" height="3" frameJoinStyle="miter" numMapUnitsPerScaleBarUnit="1" size="145.54,16.2165,mm" minBarWidth="50" subdivisionsHeight="1.5" numSegmentsLeft="2" numSegments="4" zValue="2" labelVerticalPlacement="0" lineJoinStyle="miter" unitType="meters" id="" segmentSizeMode="1" numUnitsPerSegment="100" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" background="false" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem maxBarWidth="150" boxContentSpace="1" numSubdivisions="1" frameJoinStyle="miter" labelHorizontalPlacement="0" blendMode="0" subdivisionsHeight="1.5" opacity="1" background="false" numUnitsPerSegment="100" positionLock="true" groupUuid="" frame="false" referencePoint="0" lineJoinStyle="miter" segmentMillimeters="26.3519" size="145.54,16.2165,mm" segmentSizeMode="1" alignment="0" lineCapStyle="square" style="Single Box" id="" height="3" zValue="2" labelBarSpace="3" type="65646" numSegments="4" position="7,189.669,mm" unitLabel="m" unitType="meters" outlineWidthM="0.3,mm" minBarWidth="50" labelVerticalPlacement="0" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" positionOnPage="7,189.669,mm" visibility="1" excludeFromExports="0" itemRotation="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidth="0.3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -28922,75 +28922,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor green="0" red="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option name="decimal_separator" value="" type="QChar"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29021,52 +29021,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29097,52 +29097,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29173,36 +29173,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -29217,36 +29217,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29261,40 +29261,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="278.027,180.318,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="false" followPresetName="Start/Finish" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="330" groupUuid="" blendMode="0" itemRotation="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionOnPage="7,5.5,mm" followPreset="true" keepLayerSet="false" position="7,5.5,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="330" blendMode="0" size="278.027,180.318,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Start/Finish" referencePoint="0" isTemporal="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionOnPage="7,5.5,mm" visibility="1" id="" position="7,5.5,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="false" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="rotation" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="rotation" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="id" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="id" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29303,45 +29303,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="3" annotationExpression="" topAnnotationDisplay="3" crossLength="3" position="3" annotationFormat="4" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="5" gridFramePenThickness="0.5" intervalX="5" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" unit="1" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="5" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="3" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="3" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="1" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="4" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" frameAnnotationDistance="1" leftAnnotationDisplay="3" minimumIntervalWidth="50" bottomAnnotationDisplay="3" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29372,44 +29372,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29432,9 +29432,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29451,32 +29451,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29491,29 +29491,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29521,65 +29521,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
+          <Option name="svgCropMarginBottom" value="0" type="QString"/>
+          <Option name="svgCropMarginLeft" value="0" type="QString"/>
+          <Option name="svgCropMarginRight" value="0" type="QString"/>
+          <Option name="svgCropMarginTop" value="0" type="QString"/>
+          <Option name="svgCropToContents" value="true" type="QString"/>
+          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
+          <Option name="svgGroupLayers" value="false" type="QString"/>
+          <Option name="svgIncludeMetadata" value="1" type="QString"/>
+          <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" sortFeatures="1" sortKey="area" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;"/>
+      <Atlas coverageLayerName="start_finish_area" hideCoverage="1" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;area&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="300" worldFileMap="" name="Fencing">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Fencing" worldFileMap="" units="mm" printResolution="300">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -29594,49 +29594,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29651,9 +29651,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29661,15 +29661,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" groupUuid="" positionOnPage="256.808,5.21277,mm" symbolWidth="7" position="256.808,5.21277,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="38.1563,67.2879,mm" fontColor="#000000" zValue="11" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="0" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="38.1563,67.2879,mm" rasterBorder="1" resizeToContents="0" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="11" wmsLegendHeight="25" title="" type="65642" position="256.808,5.21277,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" positionOnPage="256.808,5.21277,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29677,53 +29677,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" style="Bold" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" source="./fencing.shp|layername=fencing" expanded="1" name="fencing" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29731,47 +29731,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="148.46,6.45211,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="10" groupUuid="" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" itemRotation="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="10" halign="1" blendMode="0" size="148.46,6.45211,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionOnPage="6.76779,191.188,mm" visibility="1" id="" position="6.76779,191.188,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29786,65 +29786,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="56.3557,6.45237,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="9" groupUuid="" blendMode="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" itemRotation="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="9" halign="2" blendMode="0" size="56.3557,6.45237,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionOnPage="182.723,191.188,mm" visibility="1" id="" position="182.723,191.188,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29859,65 +29859,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="26.8205,6.82826,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="REVISION 1.0" itemRotation="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="2" blendMode="0" size="26.8205,6.82826,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 1.0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionOnPage="209.146,198.083,mm" visibility="1" id="" position="209.146,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29932,65 +29932,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="51.1638,7.07327,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" halign="1" blendMode="0" size="51.1638,7.07327,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionOnPage="62.6706,198.083,mm" visibility="1" id="" position="62.6706,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30005,65 +30005,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="64.7594,7.10512,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="1" blendMode="0" size="64.7594,7.10512,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionOnPage="116.805,198.083,mm" visibility="1" id="" position="116.805,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30078,65 +30078,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="52.7903,7.07327,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="1" blendMode="0" size="52.7903,7.07327,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionOnPage="6.76779,198.083,mm" visibility="1" id="" position="6.76779,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30151,39 +30151,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="49.3143,29.8354,mm" opacity="1" file="../GunRun2022_250.png" frameJoinStyle="miter" anchorPoint="8" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="49.3143" zValue="4" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureHeight="26.4325">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="49.3143" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="49.3143,29.8354,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="26.4325" referencePoint="0" pictureRotation="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionOnPage="243.098,175.353,mm" visibility="1" id="" northMode="0" position="243.098,175.353,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="8" background="false" positionLock="true" file="../GunRun2022_250.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30191,42 +30191,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="232.01,0.14328,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="3" groupUuid="" blendMode="0" itemRotation="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" blendMode="0" size="232.01,0.14328,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" id="" position="6.91779,197.79,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -30241,55 +30241,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem referencePoint="0" labelBarSpace="1" alignment="0" type="65646" positionLock="true" maxBarWidth="100" labelHorizontalPlacement="0" opacity="1" outlineWidth="0.2" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" groupUuid="" positionOnPage="6.76779,2.8482,mm" lineCapStyle="square" numSubdivisions="1" position="6.76779,2.8482,mm" excludeFromExports="0" itemRotation="0" style="Double Box" segmentMillimeters="31.3239" visibility="1" boxContentSpace="0.2" blendMode="0" height="2" frameJoinStyle="miter" numMapUnitsPerScaleBarUnit="1" size="103.733,15.8378,mm" minBarWidth="25" subdivisionsHeight="1.5" numSegmentsLeft="2" numSegments="2" zValue="2" labelVerticalPlacement="0" lineJoinStyle="round" unitType="meters" id="" segmentSizeMode="1" numUnitsPerSegment="40" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" background="false" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem maxBarWidth="100" boxContentSpace="0.2" numSubdivisions="1" frameJoinStyle="miter" labelHorizontalPlacement="0" blendMode="0" subdivisionsHeight="1.5" opacity="1" background="false" numUnitsPerSegment="40" positionLock="true" groupUuid="" frame="false" referencePoint="0" lineJoinStyle="round" segmentMillimeters="31.3239" size="103.733,15.8378,mm" segmentSizeMode="1" alignment="0" lineCapStyle="square" style="Double Box" id="" height="2" zValue="2" labelBarSpace="1" type="65646" numSegments="2" position="6.76779,2.8482,mm" unitLabel="m" unitType="meters" outlineWidthM="0.3,mm" minBarWidth="25" labelVerticalPlacement="0" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" positionOnPage="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" itemRotation="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidth="0.2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30304,75 +30304,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor green="0" red="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option name="decimal_separator" value="" type="QChar"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30403,52 +30403,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30479,52 +30479,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30555,36 +30555,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -30599,36 +30599,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30643,46 +30643,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="283.418,180.92,mm" opacity="0.9" mapFlags="0" frameJoinStyle="miter" background="false" followPresetName="Fencing" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionOnPage="6.76779,9.35102,mm" followPreset="true" keepLayerSet="false" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="283.418,180.92,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" opacity="0.9" labelMargin="0,mm" mapFlags="0" followPresetName="Fencing" referencePoint="0" isTemporal="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionOnPage="6.76779,9.35102,mm" visibility="1" id="" position="6.76779,9.35102,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="false" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
                   <Option name="transformer" type="Map">
                     <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+                      <Option name="exponent" value="1" type="double"/>
+                      <Option name="maxOutput" value="360" type="double"/>
+                      <Option name="maxValue" value="0" type="double"/>
+                      <Option name="minOutput" value="0" type="double"/>
+                      <Option name="minValue" value="0" type="double"/>
+                      <Option name="nullOutput" value="0" type="double"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option name="t" value="0" type="int"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30704,45 +30704,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="3" annotationExpression="" topAnnotationDisplay="3" crossLength="3" position="3" annotationFormat="4" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="5" gridFramePenThickness="0.5" intervalX="5" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" unit="1" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="5" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="3" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="3" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="1" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="4" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" frameAnnotationDistance="1" leftAnnotationDisplay="3" minimumIntervalWidth="50" bottomAnnotationDisplay="3" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -30773,44 +30773,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -30833,9 +30833,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30852,32 +30852,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -30892,29 +30892,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30922,65 +30922,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" hideCoverage="1" sortFeatures="1" sortKey="&quot;group&quot;" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;"/>
+      <Atlas coverageLayerName="fence_groups" hideCoverage="1" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" sortKey="&quot;group&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="9" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="9" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -30995,49 +30995,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31052,59 +31052,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="false" size="83.9998,10.4638,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="Directions to Start of Race" itemRotation="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionOnPage="4.43449,186.634,mm" position="4.43449,186.634,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="1" blendMode="0" size="83.9998,10.4638,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Directions to Start of Race" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionOnPage="4.43449,186.634,mm" visibility="1" id="" position="4.43449,186.634,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31119,65 +31119,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="48.2923,9.511,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="Gun Run" itemRotation="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionOnPage="4.43449,197.498,mm" position="4.43449,197.498,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" halign="1" blendMode="0" size="48.2923,9.511,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Gun Run" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionOnPage="4.43449,197.498,mm" visibility="1" id="" position="4.43449,197.498,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31192,33 +31192,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByMap="1" groupUuid="" positionOnPage="10.096,10.8563,mm" symbolWidth="9" position="10.096,10.8563,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="0" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="round" size="59.0766,76,mm" fontColor="#000000" zValue="6" equalColumnWidth="0" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="2" symbolHeight="5" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="139" red="139" green="139"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="0" frameJoinStyle="round" blendMode="0" opacity="1" background="true" positionLock="false" groupUuid="" legendFilterByMap="1" symbolHeight="5" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="59.0766,76,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="0" id="" zValue="6" wmsLegendHeight="25" title="" type="65642" position="10.096,10.8563,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="9" columnCount="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" positionOnPage="10.096,10.8563,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="2">
+        <FrameColor green="139" red="139" blue="139" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31226,52 +31226,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="3" marginTop="2.5" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="3" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Ask Me">
+          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" expanded="1" name="poi_labels" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Checked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
+                  <Option name="legend/label-1" value="Toilets" type="QString"/>
+                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
+                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
+                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
+                  <Option name="legend/label-5" value="Parking" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Checked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
+                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
+                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31279,47 +31279,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="27.7839,6.871,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="REVISION 1.0" itemRotation="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionOnPage="221.862,190.027,mm" position="221.862,190.027,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="27.7839,6.871,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 1.0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionOnPage="221.862,190.027,mm" visibility="1" id="" position="221.862,190.027,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31334,65 +31334,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="51.6706,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="4" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionOnPage="197.975,197.498,mm" position="197.975,197.498,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" halign="2" blendMode="0" size="51.6706,6.60801,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionOnPage="197.975,197.498,mm" visibility="1" id="" position="197.975,197.498,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31407,39 +31407,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="false" pictureRotation="0" size="42.9838,24.3824,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="24.2337" zValue="3" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionOnPage="249.646,179.724,mm" position="249.646,179.724,mm" outlineWidthM="0.3,mm" pictureHeight="24.3824">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" pictureWidth="24.2337" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="42.9838,24.3824,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="24.3824" referencePoint="0" pictureRotation="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionOnPage="249.646,179.724,mm" visibility="1" id="" northMode="0" position="249.646,179.724,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="false" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31447,42 +31447,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="244.912,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="2" groupUuid="" blendMode="0" itemRotation="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionOnPage="4.58449,197.248,mm" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" blendMode="0" size="244.912,0.1,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionOnPage="4.58449,197.248,mm" shapeType="1" visibility="1" id="" position="4.58449,197.248,mm" excludeFromExports="0" frame="false" background="false" positionLock="false" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -31497,39 +31497,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="288.007,183.616,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Ask Me" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="4.43449,6.411,mm" followPreset="true" keepLayerSet="false" position="4.43449,6.411,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="288.007,183.616,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Ask Me" referencePoint="0" isTemporal="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="4.43449,6.411,mm" visibility="1" id="" position="4.43449,6.411,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="true" positionLock="false" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31551,45 +31551,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -31620,44 +31620,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -31680,40 +31680,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -31728,29 +31728,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31758,56 +31758,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" hideCoverage="0" sortFeatures="0" filterFeatures="0" enabled="0" pageNameExpression=""/>
+      <Atlas hideCoverage="0" enabled="0" sortFeatures="0" pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="" name="Routes">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Routes" worldFileMap="" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31822,49 +31822,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31879,59 +31879,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="true" size="61.5373,6.8714,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="13" groupUuid="" blendMode="0" labelText="REVISION 3.2" itemRotation="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionOnPage="200.171,199.082,mm" position="200.171,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="13" halign="2" blendMode="0" size="61.5373,6.8714,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 3.2" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionOnPage="200.171,199.082,mm" visibility="1" id="" position="200.171,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31946,65 +31946,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="61.5373,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="12" groupUuid="" blendMode="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" itemRotation="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionOnPage="9.7863,192.073,mm" position="9.7863,192.073,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="12" halign="1" blendMode="0" size="61.5373,6.60801,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionOnPage="9.7863,192.073,mm" visibility="1" id="" position="9.7863,192.073,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32019,65 +32019,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="61.5373,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="11" groupUuid="" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" itemRotation="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionOnPage="9.7863,199.082,mm" position="9.7863,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="11" halign="1" blendMode="0" size="61.5373,6.60801,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionOnPage="9.7863,199.082,mm" visibility="1" id="" position="9.7863,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32092,39 +32092,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" opacity="1" file="../GunRun2022_250.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="29.7523" zValue="10" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureHeight="15.9472">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="10" pictureWidth="29.7523" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="29.7523,17.4718,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="15.9472" referencePoint="0" pictureRotation="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionOnPage="262.196,188.218,mm" visibility="1" id="" northMode="0" position="262.196,188.218,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="true" file="../GunRun2022_250.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32132,42 +32132,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="251.982,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="9" groupUuid="" blendMode="0" itemRotation="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionOnPage="9.57644,198.832,mm" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="9" blendMode="0" size="251.982,0.1,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionOnPage="9.57644,198.832,mm" shapeType="1" visibility="1" id="" position="9.57644,198.832,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -32182,29 +32182,29 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="107.861,186.385,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Trail Finish" isTemporal="0" zValue="8" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" excludeFromExports="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionOnPage="9.57644,5.42566,mm" followPreset="true" keepLayerSet="false" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" keepLayerSet="false" mapRotation="0" blendMode="0" size="107.861,186.385,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionOnPage="9.57644,5.42566,mm" visibility="1" id="Trail Finish" position="9.57644,5.42566,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32213,28 +32213,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905" ymin="-33.93243205975926458"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="179.156,189.279,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Trail Start" isTemporal="0" zValue="7" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" excludeFromExports="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionOnPage="112.643,4.09761,mm" followPreset="true" keepLayerSet="false" position="112.643,4.09761,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" keepLayerSet="false" mapRotation="0" blendMode="0" size="179.156,189.279,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionOnPage="112.643,4.09761,mm" visibility="1" id="Trail Start" position="112.643,4.09761,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32243,53 +32243,53 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743" ymin="-33.95772328900195447"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="67.7828,166.874,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Left inset 21KM" isTemporal="0" zValue="6" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" excludeFromExports="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionOnPage="5.86559,4.09761,mm" followPreset="true" keepLayerSet="false" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" keepLayerSet="false" mapRotation="0" blendMode="0" size="67.7828,166.874,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionOnPage="5.86559,4.09761,mm" visibility="1" id="Left inset 21KM" position="5.86559,4.09761,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32298,28 +32298,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="113.3,76.1023,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Bottom inset 21KM" isTemporal="0" zValue="5" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" excludeFromExports="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionOnPage="133.191,119.125,mm" followPreset="true" keepLayerSet="false" position="133.191,119.125,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="144" red="103" green="34"/>
-        <BackgroundColor alpha="255" blue="215" red="200" green="175"/>
+      <LayoutItem itemRotation="0" zValue="5" keepLayerSet="false" mapRotation="0" blendMode="0" size="113.3,76.1023,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionOnPage="133.191,119.125,mm" visibility="1" id="Bottom inset 21KM" position="133.191,119.125,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="34" red="103" blue="144" alpha="255"/>
+        <BackgroundColor green="175" red="200" blue="215" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32328,28 +32328,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
+        <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="68.3676,117.12,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="0" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="End inset Trail" isTemporal="0" zValue="4" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" excludeFromExports="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionOnPage="19.6693,7.89412,mm" followPreset="true" keepLayerSet="false" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" keepLayerSet="false" mapRotation="0" blendMode="0" size="68.3676,117.12,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionOnPage="19.6693,7.89412,mm" visibility="0" id="End inset Trail" position="19.6693,7.89412,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32358,28 +32358,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005" ymin="-33.91454383501641701"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="63.655,88.3012,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="0" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Start inset Trail" isTemporal="0" zValue="3" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" excludeFromExports="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionOnPage="170.062,49.6297,mm" followPreset="true" keepLayerSet="false" position="170.062,49.6297,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" keepLayerSet="false" mapRotation="0" blendMode="0" size="63.655,88.3012,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionOnPage="170.062,49.6297,mm" visibility="0" id="Start inset Trail" position="170.062,49.6297,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32388,28 +32388,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591" ymin="-33.94823764719958348"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="75.8756,69.7635,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="0" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Contour inset Trail" isTemporal="0" zValue="2" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" excludeFromExports="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" positionOnPage="200.321,125.314,mm" followPreset="true" keepLayerSet="false" position="200.321,125.314,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" keepLayerSet="false" mapRotation="0" blendMode="0" size="75.8756,69.7635,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" positionOnPage="200.321,125.314,mm" visibility="0" id="Contour inset Trail" position="200.321,125.314,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32418,38 +32418,38 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047" ymin="-33.95702588572736147"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="282.372,186.105,mm" opacity="1" mapFlags="0" frameJoinStyle="round" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Main Map" isTemporal="0" zValue="1" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionOnPage="9.50144,5.50066,mm" followPreset="true" keepLayerSet="false" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="282.372,186.105,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.15,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionOnPage="9.50144,5.50066,mm" visibility="1" id="Main Map" position="9.50144,5.50066,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="false" followPreset="true" type="65639" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32458,45 +32458,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.36400000000000077" xmax="18.45389078049076304" ymax="-33.89975491900725046" ymin="-33.95900000000000318"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -32527,44 +32527,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -32587,40 +32587,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -32635,29 +32635,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32665,34 +32665,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" centered="0" name="Overview 1" position="3" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" show="1">
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <ComposerMapOverview name="Overview 1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" show="1" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" blendMode="0" centered="0">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties" type="Map">
                   <Option name="alpha" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="103,34,144,26" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="103,34,144,26" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="103,34,144,26" k="color"/>
@@ -32707,9 +32707,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32717,9 +32717,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32727,63 +32727,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="all_routes" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" hideCoverage="0" sortFeatures="1" sortKey="&quot;Sort&quot;" sortAscending="1" filterFeatures="1" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;"/>
+      <Atlas coverageLayerName="all_routes" hideCoverage="0" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" 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'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortKey="&quot;Sort&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1"/>
     </Layout>
-    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan A1">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Marshal Plan A1" worldFileMap="" units="mm" printResolution="120">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -32798,49 +32798,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="594,841,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="594,841,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -32855,9 +32855,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32865,15 +32865,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" groupUuid="" positionOnPage="25.5925,18.7971,mm" symbolWidth="7" position="25.5925,18.7971,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="4,4,mm" fontColor="#000000" zValue="8" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="false" referencePoint="0" maxSymbolSize="0" size="4,4,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="8" wmsLegendHeight="25" title="" type="65642" position="25.5925,18.7971,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" positionOnPage="25.5925,18.7971,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32881,37 +32881,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="1" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" legend_split_behavior="0" id="all_routes20170907054841602" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32919,47 +32919,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="91.9494,15.0649,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="MARSHAL POSITIONS" itemRotation="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionOnPage="5.2963,808.939,mm" position="5.2963,808.939,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" halign="1" blendMode="0" size="91.9494,15.0649,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="MARSHAL POSITIONS" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionOnPage="5.2963,808.939,mm" visibility="1" id="" position="5.2963,808.939,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32974,65 +32974,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="56.6212,15.3656,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="REVISION 1.2" itemRotation="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionOnPage="430.403,825.052,mm" position="430.403,825.052,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="56.6212,15.3656,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 1.2" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionOnPage="430.403,825.052,mm" visibility="1" id="" position="430.403,825.052,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33047,65 +33047,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="114.848,15.0635,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="4" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionOnPage="372.175,808.942,mm" position="372.175,808.942,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" halign="2" blendMode="0" size="114.848,15.0635,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionOnPage="372.175,808.942,mm" visibility="1" id="" position="372.175,808.942,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33120,39 +33120,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="100.498,63.9757,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="8" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="63.5856" zValue="3" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionOnPage="489.557,775.395,mm" position="489.557,775.395,mm" outlineWidthM="0.3,mm" pictureHeight="63.9757">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" pictureWidth="63.5856" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="100.498,63.9757,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="63.9757" referencePoint="0" pictureRotation="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionOnPage="489.557,775.395,mm" visibility="1" id="" northMode="0" position="489.557,775.395,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="8" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33160,42 +33160,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="481.428,0.606138,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="2" groupUuid="" blendMode="0" itemRotation="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionOnPage="5.4463,824.155,mm" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" blendMode="0" size="481.428,0.606138,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionOnPage="5.4463,824.155,mm" shapeType="1" visibility="1" id="" position="5.4463,824.155,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33210,39 +33210,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="584.759,811.213,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Marshal overview" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" excludeFromExports="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionOnPage="3.94474,5.25965,mm" followPreset="true" keepLayerSet="false" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="584.759,811.213,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal overview" referencePoint="0" isTemporal="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionOnPage="3.94474,5.25965,mm" visibility="1" id="" position="3.94474,5.25965,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33251,49 +33251,49 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" sortFeatures="1" sortKey="page" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" pageNameExpression="&quot;page&quot;"/>
+      <Atlas coverageLayerName="complete_marshal_overview" hideCoverage="1" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="" name="Access Roads">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Access Roads" worldFileMap="" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -33308,49 +33308,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -33365,27 +33365,27 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" groupUuid="" positionOnPage="244.484,130.172,mm" symbolWidth="7" position="244.484,130.172,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="34.45,40.8,mm" fontColor="#000000" zValue="15" equalColumnWidth="0" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="185" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="0" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="34.45,40.8,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="15" wmsLegendHeight="25" title="" type="65642" position="244.484,130.172,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" positionOnPage="244.484,130.172,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33393,35 +33393,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Residents Access">
+          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Checked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33429,47 +33429,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="194.851,7.272,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" itemRotation="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="1" blendMode="0" size="194.851,7.272,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionOnPage="9.37446,191.81,mm" visibility="1" id="" position="9.37446,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33484,65 +33484,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="57.4836,6.8714,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="REVISION 1.1" itemRotation="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="2" blendMode="0" size="57.4836,6.8714,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="REVISION 1.1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionOnPage="204.225,191.81,mm" visibility="1" id="" position="204.225,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33557,65 +33557,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="51.6706,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="51.6706,6.60801,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionOnPage="210.038,199.082,mm" visibility="1" id="" position="210.038,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33630,39 +33630,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="17.3653" zValue="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="17.3653" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="29.7523,17.4718,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="17.4718" referencePoint="0" pictureRotation="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionOnPage="262.196,188.218,mm" visibility="1" id="" northMode="0" position="262.196,188.218,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33670,42 +33670,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="251.959,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="3" groupUuid="" blendMode="0" itemRotation="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" blendMode="0" size="251.959,0.1,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" id="" position="9.59946,198.832,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33720,54 +33720,54 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="67.7828,166.874,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Access Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="2" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" excludeFromExports="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionOnPage="5.86559,4.09761,mm" followPreset="true" keepLayerSet="false" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" keepLayerSet="false" mapRotation="0" blendMode="0" size="67.7828,166.874,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Access Routes" referencePoint="0" isTemporal="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionOnPage="5.86559,4.09761,mm" visibility="1" id="" position="5.86559,4.09761,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33789,45 +33789,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -33858,44 +33858,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -33918,40 +33918,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -33966,29 +33966,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33996,38 +33996,38 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="282.012,175.592,mm" opacity="1" mapFlags="0" frameJoinStyle="round" background="true" followPresetName="Access Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionOnPage="9.44946,9.08557,mm" followPreset="true" keepLayerSet="false" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="282.012,175.592,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.15,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Access Routes" referencePoint="0" isTemporal="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionOnPage="9.44946,9.08557,mm" visibility="1" id="" position="9.44946,9.08557,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34049,45 +34049,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34118,44 +34118,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34178,40 +34178,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34226,29 +34226,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34256,56 +34256,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;"/>
+      <Atlas coverageLayerName="residents_access" hideCoverage="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -34320,49 +34320,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -34377,59 +34377,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="true" size="194.851,7.272,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="Access to P9 Parking and VIP Tent" itemRotation="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="1" blendMode="0" size="194.851,7.272,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionOnPage="9.37446,191.81,mm" visibility="1" id="" position="9.37446,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34444,65 +34444,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="57.4836,6.8714,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="REVISION 1.0" itemRotation="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="2" blendMode="0" size="57.4836,6.8714,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="REVISION 1.0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionOnPage="204.225,191.81,mm" visibility="1" id="" position="204.225,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34517,65 +34517,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="51.6706,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="51.6706,6.60801,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionOnPage="210.038,199.082,mm" visibility="1" id="" position="210.038,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34590,39 +34590,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="17.3653" zValue="4" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="17.3653" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="29.7523,17.4718,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="17.4718" referencePoint="0" pictureRotation="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionOnPage="262.196,188.218,mm" visibility="1" id="" northMode="0" position="262.196,188.218,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34630,42 +34630,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="251.959,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="3" groupUuid="" blendMode="0" itemRotation="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" blendMode="0" size="251.959,0.1,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" id="" position="9.59946,198.832,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34680,39 +34680,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="282.012,182.649,mm" opacity="1" mapFlags="0" frameJoinStyle="round" background="true" followPresetName="" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" excludeFromExports="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionOnPage="9.44946,7.25098,mm" followPreset="false" keepLayerSet="false" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="282.012,182.649,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" outlineWidthM="0.15,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="" referencePoint="0" isTemporal="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionOnPage="9.44946,7.25098,mm" visibility="1" id="" position="9.44946,7.25098,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="true" positionLock="false" followPreset="false" type="65639" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34734,45 +34734,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34803,44 +34803,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34863,40 +34863,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34911,29 +34911,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34941,56 +34941,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;"/>
+      <Atlas coverageLayerName="residents_access" hideCoverage="1" coverageLayerProvider="ogr" enabled="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Marshal Plan" worldFileMap="" units="mm" printResolution="120">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35005,49 +35005,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,420,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" excludeFromExports="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,420,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35062,9 +35062,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35072,47 +35072,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="true" size="23.5967,8.3142,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="4" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="14" groupUuid="" blendMode="0" labelText="Page [% &quot;page&quot; %] " itemRotation="0" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionOnPage="112.086,406.476,mm" position="112.086,406.476,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="9" halign="4" blendMode="0" size="23.5967,8.3142,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Page [% &quot;page&quot; %] " uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionOnPage="112.086,406.476,mm" visibility="1" id="" position="112.086,406.476,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35127,33 +35127,106 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" groupUuid="" positionOnPage="15.6525,12.5708,mm" symbolWidth="7" position="15.6525,12.5708,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="21.6797,33,mm" fontColor="#000000" zValue="8" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="2" blendMode="0" size="27.7839,7.51682,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 3.2" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionOnPage="214.292,406.874,mm" visibility="1" id="" position="214.292,406.874,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
+          <families/>
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </data_defined_properties>
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
+                <Option type="Map">
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,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="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties"/>
+                    <Option name="type" value="collection" type="QString"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="false" referencePoint="0" maxSymbolSize="0" size="21.6797,33,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="7" wmsLegendHeight="25" title="" type="65642" position="15.6525,12.5708,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" positionOnPage="15.6525,12.5708,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35161,37 +35234,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="1" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -35199,47 +35272,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="45.1194,8.13137,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="MARSHAL POSITIONS" itemRotation="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionOnPage="5.69321,398.344,mm" position="5.69321,398.344,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="1" blendMode="0" size="45.1194,8.13137,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="MARSHAL POSITIONS" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionOnPage="5.69321,398.344,mm" visibility="1" id="" position="5.69321,398.344,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35254,65 +35327,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="118.192,7.80192,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" itemRotation="0" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionOnPage="5.69321,406.988,mm" position="5.69321,406.988,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="1" blendMode="0" size="118.192,7.80192,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionOnPage="5.69321,406.988,mm" visibility="1" id="" position="5.69321,406.988,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35327,65 +35400,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="27.7839,7.51682,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="REVISION 3.1" itemRotation="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionOnPage="214.292,406.874,mm" position="214.292,406.874,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" halign="2" blendMode="0" size="93.5757,8.13167,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionOnPage="148.501,398.344,mm" visibility="1" id="" position="148.501,398.344,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35400,112 +35473,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="93.5757,8.13167,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="4" groupUuid="" blendMode="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" itemRotation="0" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionOnPage="148.501,398.344,mm" position="148.501,398.344,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" pictureWidth="49.3143" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="49.3143,31.2967,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="26.4325" referencePoint="0" pictureRotation="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionOnPage="243.319,382.696,mm" visibility="1" id="" northMode="0" position="243.319,382.696,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="8" background="false" positionLock="true" file="../GunRun2022_250.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
-          <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </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" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,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="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="49.3143,31.2967,mm" opacity="1" file="../GunRun2022_250.png" frameJoinStyle="miter" anchorPoint="8" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="49.3143" zValue="3" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionOnPage="243.319,382.696,mm" position="243.319,382.696,mm" outlineWidthM="0.3,mm" pictureHeight="26.4325">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35513,42 +35513,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="236.083,0.14328,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="2" groupUuid="" blendMode="0" itemRotation="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" excludeFromExports="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionOnPage="5.84321,406.626,mm" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" blendMode="0" size="236.083,0.14328,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionOnPage="5.84321,406.626,mm" shapeType="1" visibility="1" id="" position="5.84321,406.626,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -35563,39 +35563,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="286.94,392.396,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Marshal overview" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" excludeFromExports="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionOnPage="5.03,5.9483,mm" followPreset="true" keepLayerSet="false" position="5.03,5.9483,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="286.94,392.396,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal overview" referencePoint="0" isTemporal="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionOnPage="5.03,5.9483,mm" visibility="1" id="" position="5.03,5.9483,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35604,37 +35604,37 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.36924763341120581" xmax="18.38613924055453452" ymax="-33.9248732774534929" ymin="-33.94797288016832226"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" sortFeatures="1" sortKey="page" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;"/>
+      <Atlas coverageLayerName="marshal_overviews" hideCoverage="1" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="0"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.34670034168259889" xmax="18.44512091979134283" ymax="-33.87832298120337526" ymin="-33.93126515593153414">
+    <DefaultViewExtent xmin="18.39069478681656378" xmax="18.40914864521195327" ymax="-33.90299421944202152" ymin="-33.91292087720354687">
       <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>
@@ -35648,10 +35648,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" timeStepUnit="h" frameRate="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings timeStep="1" frameRate="1" timeStepUnit="h" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
@@ -35660,29 +35660,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="direction_format" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option name="decimal_separator" value="" type="QChar"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="direction_format" value="0" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" value="" type="QChar"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_leading_degree_zeros" type="bool"/>
-        <Option value="false" name="show_leading_zeros" type="bool"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="false" name="show_suffix" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
+        <Option name="decimal_separator" value="" type="QChar"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_leading_degree_zeros" value="false" type="bool"/>
+        <Option name="show_leading_zeros" value="false" type="bool"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_suffix" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" value="" type="QChar"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 5852b91..f7e6869 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 projectname="Gun Run" saveDateTime="2022-09-07T21:05:48" saveUserFull="Timothy Allen" version="3.26.2-Buenos Aires" saveUser="tim">
+<qgis projectname="Gun Run" saveUserFull="Timothy Allen" version="3.26.2-Buenos Aires" saveDateTime="2022-09-08T19:43:51" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,98 +21,98 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Marshals">
+    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" expanded="1" name="marshal_positions" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="marshal_positions" expanded="1" checked="Qt::Checked" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions" legend_split_behavior="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="extra_security20170921130834191" patch_size="0,0" source="./extra_security.shp" expanded="1" name="extra_security" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="extra_security" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./extra_security.shp" legend_split_behavior="0" id="extra_security20170921130834191" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="delimitedtext" id="marshals_by_position20161003112326575" patch_size="0,0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" expanded="1" name="marshals_by_position" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="marshals_by_position" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_split_behavior="0" id="marshals_by_position20161003112326575" providerKey="delimitedtext" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" expanded="1" name="complete_marshal_overview" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="complete_marshal_overview" expanded="1" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_split_behavior="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" expanded="0" name="marshal_overviews" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="marshal_overviews" expanded="0" checked="Qt::Unchecked" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews" legend_split_behavior="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Fencing and Cones">
+    <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" source="./fencing.shp|layername=fencing" expanded="1" name="fencing" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" expanded="1" name="fence_groups" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="fence_groups" expanded="1" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_split_behavior="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Markers">
+      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer checked="Qt::Checked" providerKey="memory" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={fc78e3c3-f2c3-48fc-a4ad-be3463968bb0}" expanded="1" name="route_markers" legend_split_behavior="0" legend_exp="">
+        <layer-tree-layer name="route_markers" expanded="1" checked="Qt::Checked" legend_exp="" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={d928530c-6b86-4858-af3e-b4cb7b7e87c6}" legend_split_behavior="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" providerKey="memory" patch_size="-1,-1">
           <customproperties>
             <Option/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option name="showFeatureCount" value="0" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " expanded="0" name="timelapse" legend_split_behavior="0" legend_exp="">
+    <layer-tree-layer name="timelapse" expanded="0" checked="Qt::Unchecked" legend_exp="" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_split_behavior="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" patch_size="0,0">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Feeding Stations">
+    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="water_tables20170921142016467" patch_size="0,0" source="./water_tables.shp" expanded="1" name="water_tables" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="water_tables" expanded="1" checked="Qt::Checked" legend_exp="" source="./water_tables.shp" legend_split_behavior="0" id="water_tables20170921142016467" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -120,95 +120,95 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="0" name="Ask Me">
+    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" expanded="1" name="poi_labels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="0" name="Residents Access">
+    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" source="./mayor.shp" expanded="1" name="mayor" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="mayor" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./mayor.shp" legend_split_behavior="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" source="./viplabels.shp" expanded="1" name="viplabels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="viplabels" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./viplabels.shp" legend_split_behavior="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" source="./vipaccess.shp" expanded="1" name="vipaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="vipaccess" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./vipaccess.shp" legend_split_behavior="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" source="./golfaccess.shp" expanded="0" name="golfaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="golfaccess" expanded="0" checked="Qt::Unchecked" legend_exp="" source="./golfaccess.shp" legend_split_behavior="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" source="./residents_access.shp|layername=residents_access" expanded="1" name="residents_access" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="residents_access" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./residents_access.shp|layername=residents_access" legend_split_behavior="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="OSM data">
+    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" source="./osm_roads.shp" expanded="0" name="osm_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="osm_roads" expanded="0" checked="Qt::Checked" legend_exp="" source="./osm_roads.shp" legend_split_behavior="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" source="./osm_places.shp|layername=osm_places" expanded="1" name="osm_places" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="osm_places" expanded="1" checked="Qt::Checked" legend_exp="" source="./osm_places.shp|layername=osm_places" legend_split_behavior="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Start and Finish pages">
+    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" source="./data-comments.shp" expanded="1" name="data-comments" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="data-comments" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./data-comments.shp" legend_split_behavior="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" source="./start_finish_area.shp" expanded="1" name="start_finish_area" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="start_finish_area" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./start_finish_area.shp" legend_split_behavior="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -216,30 +216,30 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="0" name="Elevation">
+    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" source="./capetownelevation-1m.shp" expanded="1" name="capetownelevation-1m" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="capetownelevation-1m" expanded="1" checked="Qt::Unchecked" legend_exp="" source="./capetownelevation-1m.shp" legend_split_behavior="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Map">
+    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" expanded="0" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" expanded="0" checked="Qt::Checked" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_split_behavior="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" expanded="1" name="Outlines" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer name="Outlines" expanded="1" checked="Qt::Checked" legend_exp="" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" legend_split_behavior="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -275,42 +275,42 @@
       <item>route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings self-snapping="1" maxScale="0" unit="1" scaleDependencyMode="0" tolerance="10" intersection-snapping="1" enabled="0" mode="3" minScale="0" type="1">
+  <snapping-settings intersection-snapping="1" unit="1" mode="3" type="1" scaleDependencyMode="0" enabled="0" maxScale="0" tolerance="10" self-snapping="1" minScale="0">
     <individual-layer-settings>
-      <layer-setting units="1" maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" enabled="0" minScale="0" type="0"/>
-      <layer-setting units="1" maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" enabled="0" minScale="0" type="0"/>
-      <layer-setting units="1" maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="2" maxScale="0" id="extra_security20170921130834191" tolerance="0" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="2" maxScale="0" id="water_tables20170921142016467" tolerance="0" enabled="0" minScale="0" type="2"/>
-      <layer-setting units="1" maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" minScale="0" type="1"/>
-      <layer-setting units="1" maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" minScale="0" type="2"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="2" maxScale="0" tolerance="0" id="water_tables20170921142016467" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="2" maxScale="0" tolerance="0" id="extra_security20170921130834191" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" minScale="0"/>
+      <layer-setting type="0" enabled="0" units="1" maxScale="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" minScale="0"/>
+      <layer-setting type="0" enabled="0" units="1" maxScale="0" tolerance="12" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" minScale="0"/>
+      <layer-setting type="2" enabled="1" units="1" maxScale="0" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" minScale="0"/>
+      <layer-setting type="1" enabled="0" units="1" maxScale="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" minScale="0"/>
+      <layer-setting type="2" enabled="0" units="1" maxScale="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.34670034168259889</xmin>
-      <ymin>-33.93126515591272607</ymin>
-      <xmax>18.44512091979134283</xmax>
-      <ymax>-33.87832298122218333</ymax>
+      <xmin>18.39718457158269516</xmin>
+      <ymin>-33.90697664352093454</ymin>
+      <xmax>18.39795348234916972</xmax>
+      <ymax>-33.90656303278116468</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -331,161 +331,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Checked" name="Marshals" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="marshal_positions" showFeatureCount="1" open="true">
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer drawingOrder="-1" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="extra_security" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="extra_security20170921130834191" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="marshals_by_position" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews" showFeatureCount="0" open="false">
+      <legendlayer drawingOrder="-1" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Fencing and Cones" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="fencing" showFeatureCount="0" open="true">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="true">
+      <legendlayer drawingOrder="-1" name="fencing" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="fence_groups" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Routes" open="true">
-      <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" name="route_markers" showFeatureCount="0" open="true">
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer drawingOrder="-1" name="route_markers" showFeatureCount="0" checked="Qt::Checked" open="true">
           <filegroup hidden="false" open="true">
-            <legendlayerfile layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" isInOverview="0"/>
+            <legendlayerfile isInOverview="0" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="all_routes" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="all_routes" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="timelapse" showFeatureCount="0" open="false">
+    <legendlayer drawingOrder="-1" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" open="false">
       <filegroup hidden="false" open="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0" isInOverview="0"/>
+        <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Unchecked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="water_tables" showFeatureCount="0" open="true">
+    <legendgroup name="Feeding Stations" checked="Qt::Unchecked" open="true">
+      <legendlayer drawingOrder="-1" name="water_tables" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="water_tables20170921142016467" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels" showFeatureCount="0" open="true">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer drawingOrder="-1" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="mayor" showFeatureCount="0" open="true">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer drawingOrder="-1" name="mayor" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="viplabels" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess" showFeatureCount="0" open="false">
+      <legendlayer drawingOrder="-1" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="residents_access" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="osm_roads" showFeatureCount="1" open="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer drawingOrder="-1" name="osm_roads" showFeatureCount="1" checked="Qt::Checked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="osm_places" showFeatureCount="1" open="true">
+      <legendlayer drawingOrder="-1" name="osm_places" showFeatureCount="1" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="data-comments" showFeatureCount="0" open="true">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer drawingOrder="-1" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m" showFeatureCount="1" open="true">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer drawingOrder="-1" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" open="false">
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Outlines" showFeatureCount="0" open="true">
+      <legendlayer drawingOrder="-1" name="Outlines" showFeatureCount="0" checked="Qt::Checked" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer legendPlaceholderImage="" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -536,7 +536,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" type="raster">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" maxScale="100000" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -601,7 +601,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -612,9 +612,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -626,58 +626,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" zscale="1" band="1" enabled="0" symbology="Line">
+      <elevation band="1" enabled="0" zscale="1" zoffset="0" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -708,36 +708,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -752,9 +752,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -763,27 +763,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="false" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Value" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="false" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Value" type="QString"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer opacity="0.5" redBand="1" greenBand="2" alphaBand="-1" type="multibandcolor" nodataColor="" blueBand="3">
+        <rasterrenderer redBand="1" type="multibandcolor" nodataColor="" blueBand="3" opacity="0.5" alphaBand="-1" greenBand="2">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -794,14 +794,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeBlue="128" colorizeStrength="100" colorizeGreen="128" saturation="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeRed="255" colorizeBlue="128" grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" type="raster">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" maxScale="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -866,7 +866,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -877,7 +877,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -889,58 +889,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" zscale="1" band="1" enabled="0" symbology="Line">
+      <elevation band="1" enabled="0" zscale="1" zoffset="0" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -971,36 +971,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -1015,9 +1015,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1026,27 +1026,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="true" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Undefined" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="true" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Undefined" type="QString"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer opacity="0.75" alphaBand="-1" band="1" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer type="singlebandcolordata" nodataColor="" band="1" opacity="0.75" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1057,14 +1057,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeBlue="128" colorizeStrength="100" colorizeGreen="128" saturation="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeRed="255" colorizeBlue="128" grayscaleMode="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1129,7 +1129,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1143,8 +1143,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100" name="length_km" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100 * 1000" name="length_m" length="-1" type="6"/>
+        <field name="length_km" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100" subType="0"/>
+        <field name="length_m" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100 * 1000" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1157,58 +1157,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="RouteLen">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="RouteLen" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1239,36 +1239,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -1283,44 +1283,44 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -1343,59 +1343,59 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" checkstate="0" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule symbol="1" description="This should be disabled, since it's only for legends" checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule symbol="2" description="This should be disabled, since it's only for legends" checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule symbol="3" description="This should be disabled, since it's only for legends" checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule symbol="4" description="This should be disabled, since it's only for legends" checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" label="Active Routes" checkstate="0" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas">
+            <rule key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" label="21KM" checkstate="0" symbol="1" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" label="10KM" checkstate="0" symbol="2" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{bdafe9b2-4918-427d-89be-41870f96981f}" label="5KM" checkstate="0" symbol="3" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{151f553a-04cc-4e24-b74d-37d5618f5223}" label="Trail" checkstate="0" symbol="4" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="5" description="Only show when active in Atlas" label="Show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule symbol="6" description="This should be disabled, since it's only for legends" checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="7" description="This should be disabled, since it's only for legends" checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="8" description="This should be disabled, since it's only for legends" checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule symbol="9" description="This should be disabled, since it's only for legends" checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" symbol="5" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" description="Only show when active in Atlas">
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM" checkstate="0" symbol="6" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM" checkstate="0" symbol="7" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM" checkstate="0" symbol="8" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends"/>
+            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail" checkstate="0" symbol="9" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="10" checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule symbol="11" checkstate="0" label="Always show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" checkstate="0" symbol="10"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day" checkstate="0" symbol="11" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1415,44 +1415,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@0" force_rhr="0" type="marker">
+              <symbol name="@0@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -1468,32 +1468,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@0@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@0@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -1508,15 +1508,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1524,35 +1524,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1583,36 +1583,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1632,40 +1632,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@2" force_rhr="0" type="marker">
+              <symbol name="@0@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1688,38 +1688,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1739,40 +1739,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@3" force_rhr="0" type="marker">
+              <symbol name="@0@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1795,47 +1795,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1855,44 +1855,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@0" force_rhr="0" type="marker">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -1908,32 +1908,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -1948,15 +1948,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1964,35 +1964,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2023,36 +2023,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2072,40 +2072,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@2" force_rhr="0" type="marker">
+              <symbol name="@1@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2128,38 +2128,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2179,40 +2179,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@3" force_rhr="0" type="marker">
+              <symbol name="@1@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2235,58 +2235,58 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="10" force_rhr="0" type="line">
+          <symbol name="10" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2317,56 +2317,56 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="11" force_rhr="0" type="line">
+          <symbol name="11" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.46" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2397,45 +2397,45 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2455,44 +2455,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@0" force_rhr="0" type="marker">
+              <symbol name="@2@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -2508,32 +2508,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -2548,15 +2548,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2564,35 +2564,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2623,36 +2623,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2672,40 +2672,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@2" force_rhr="0" type="marker">
+              <symbol name="@2@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2728,38 +2728,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2779,40 +2779,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@3" force_rhr="0" type="marker">
+              <symbol name="@2@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2835,47 +2835,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="line">
+          <symbol name="3" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2895,44 +2895,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@0" force_rhr="0" type="marker">
+              <symbol name="@3@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -2948,32 +2948,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@3@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@3@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="145,211,55,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -2988,15 +2988,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3004,35 +3004,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,211,55,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3063,36 +3063,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3112,40 +3112,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@2" force_rhr="0" type="marker">
+              <symbol name="@3@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3168,38 +3168,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3219,40 +3219,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@3" force_rhr="0" type="marker">
+              <symbol name="@3@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3275,47 +3275,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="line">
+          <symbol name="4" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3335,44 +3335,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@4@0" force_rhr="0" type="marker">
+              <symbol name="@4@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -3388,32 +3388,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@4@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@4@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,72,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -3428,15 +3428,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3444,35 +3444,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,72,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3503,36 +3503,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3552,40 +3552,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@4@2" force_rhr="0" type="marker">
+              <symbol name="@4@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3608,38 +3608,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3659,40 +3659,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@4@3" force_rhr="0" type="marker">
+              <symbol name="@4@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3715,47 +3715,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="5" force_rhr="0" type="line">
+          <symbol name="5" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3775,44 +3775,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@5@0" force_rhr="0" type="marker">
+              <symbol name="@5@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -3828,32 +3828,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@5@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@5@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -3868,15 +3868,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3884,35 +3884,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3943,36 +3943,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3992,40 +3992,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@5@2" force_rhr="0" type="marker">
+              <symbol name="@5@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4048,38 +4048,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4099,40 +4099,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@5@3" force_rhr="0" type="marker">
+              <symbol name="@5@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4155,47 +4155,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="6" force_rhr="0" type="line">
+          <symbol name="6" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4215,44 +4215,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@6@0" force_rhr="0" type="marker">
+              <symbol name="@6@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -4268,32 +4268,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@6@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@6@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -4308,15 +4308,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4324,35 +4324,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4383,36 +4383,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4432,40 +4432,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@6@2" force_rhr="0" type="marker">
+              <symbol name="@6@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4488,38 +4488,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4539,40 +4539,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@6@3" force_rhr="0" type="marker">
+              <symbol name="@6@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4595,47 +4595,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="7" force_rhr="0" type="line">
+          <symbol name="7" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4655,44 +4655,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@7@0" force_rhr="0" type="marker">
+              <symbol name="@7@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -4708,32 +4708,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@7@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@7@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -4748,15 +4748,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4764,35 +4764,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4823,36 +4823,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4872,40 +4872,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@7@2" force_rhr="0" type="marker">
+              <symbol name="@7@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4928,38 +4928,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4979,40 +4979,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@7@3" force_rhr="0" type="marker">
+              <symbol name="@7@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5035,47 +5035,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="8" force_rhr="0" type="line">
+          <symbol name="8" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5095,44 +5095,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@8@0" force_rhr="0" type="marker">
+              <symbol name="@8@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -5148,32 +5148,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@8@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@8@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="145,211,55,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -5188,15 +5188,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5204,35 +5204,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,211,55,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5263,36 +5263,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5312,40 +5312,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@8@2" force_rhr="0" type="marker">
+              <symbol name="@8@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5368,38 +5368,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5419,40 +5419,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@8@3" force_rhr="0" type="marker">
+              <symbol name="@8@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5475,47 +5475,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="9" force_rhr="0" type="line">
+          <symbol name="9" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5535,44 +5535,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@9@0" force_rhr="0" type="marker">
+              <symbol name="@9@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -5588,32 +5588,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@9@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@9@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,72,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -5628,15 +5628,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5644,35 +5644,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,72,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5703,36 +5703,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5752,40 +5752,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@9@2" force_rhr="0" type="marker">
+              <symbol name="@9@2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5808,38 +5808,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5859,40 +5859,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@9@3" force_rhr="0" type="marker">
+              <symbol name="@9@3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5915,15 +5915,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5937,42 +5937,42 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule description="Active routes" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="round($length / 1000, 0)" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="round($length / 1000, 0)" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="164,113,88,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -5995,34 +5995,34 @@
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -6037,98 +6037,98 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="1" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="km_marker()" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+              <placement priority="10" placement="0" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="km_marker()" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="1" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -6137,9 +6137,9 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -6149,7 +6149,7 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -6157,48 +6157,48 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -6229,9 +6229,9 @@
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6239,215 +6239,215 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
       </aliases>
       <defaults>
-        <default field="Name" expression="" applyOnUpdate="0"/>
-        <default field="descriptio" expression="" applyOnUpdate="0"/>
-        <default field="timestamp" expression="" applyOnUpdate="0"/>
-        <default field="begin" expression="" applyOnUpdate="0"/>
-        <default field="end" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
-        <default field="RouteLen" expression="" applyOnUpdate="0"/>
-        <default field="Source" expression="" applyOnUpdate="0"/>
-        <default field="Sort" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
-        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
       </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="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100" name="length_km" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="$length * 100 * 1000" name="length_m" length="-1" type="6"/>
+        <field name="length_km" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100" subType="0"/>
+        <field name="length_m" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="$length * 100 * 1000" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
         <columns>
-          <column hidden="0" width="152" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="163" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="188" name="length_m" type="field"/>
-          <column hidden="0" width="-1" name="Sort" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="266" name="length_km" type="field"/>
+          <column name="Name" hidden="0" type="field" width="152"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="163"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="188"/>
+          <column name="Sort" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="266"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6479,32 +6479,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -6525,7 +6525,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6598,58 +6598,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6680,36 +6680,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -6724,44 +6724,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -6784,54 +6784,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="183,72,75,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="183,72,75,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6862,9 +6862,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6875,36 +6875,36 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="ID">
+        <field name="ID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="height">
+        <field name="height" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="elevation">
+        <field name="elevation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -6913,30 +6913,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias name="" index="0" field="ID"/>
+        <alias name="" index="1" field="height"/>
+        <alias name="" index="2" field="elevation"/>
       </aliases>
       <defaults>
-        <default field="ID" expression="" applyOnUpdate="0"/>
-        <default field="height" expression="" applyOnUpdate="0"/>
-        <default field="elevation" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="height" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="elevation" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="ID"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="height"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="elevation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6959,7 +6959,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Polygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7034,58 +7034,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7116,36 +7116,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -7160,44 +7160,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7220,38 +7220,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -7266,9 +7266,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7279,45 +7279,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -7326,34 +7326,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7376,7 +7376,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7441,7 +7441,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7466,58 +7466,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7548,36 +7548,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -7592,44 +7592,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7652,54 +7652,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,85,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,85,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7730,9 +7730,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7743,32 +7743,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="Name" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="Name" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -7783,67 +7783,67 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="2" placement="2" geometryGeneratorType="LineGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="5" placement="2" allowDegraded="0" geometryGeneratorType="LineGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="Name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="Name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -7851,48 +7851,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -7923,9 +7923,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7933,30 +7933,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7965,30 +7965,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Name"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8020,12 +8020,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8033,7 +8033,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8098,7 +8098,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8123,58 +8123,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8205,36 +8205,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -8249,44 +8249,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8309,48 +8309,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule symbol="1" description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule symbol="2" description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas"/>
+          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas"/>
+          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8370,40 +8370,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@0" force_rhr="0" type="marker">
+              <symbol name="@0@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="miter" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="area" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="miter" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="area" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -8426,32 +8426,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8471,44 +8471,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@1" force_rhr="0" type="marker">
+              <symbol name="@0@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -8524,32 +8524,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@0@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@0@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -8564,9 +8564,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8574,35 +8574,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -8633,39 +8633,39 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8685,44 +8685,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@0" force_rhr="0" type="marker">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8738,32 +8738,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8778,9 +8778,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8788,24 +8788,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8825,44 +8825,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@1" force_rhr="0" type="marker">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8878,32 +8878,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8918,9 +8918,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8928,35 +8928,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -8987,39 +8987,39 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9039,44 +9039,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@0" force_rhr="0" type="marker">
+              <symbol name="@2@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9092,32 +9092,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill">
+                  <symbol name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="69,100,25,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="69,100,25,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9132,9 +9132,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9142,24 +9142,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9179,44 +9179,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@1" force_rhr="0" type="marker">
+              <symbol name="@2@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9232,32 +9232,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@2@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@2@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9272,9 +9272,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9282,35 +9282,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="69,100,25,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="69,100,25,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9341,9 +9341,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9355,11 +9355,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9367,48 +9367,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -9439,9 +9439,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9449,65 +9449,65 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Distance"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9539,30 +9539,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9570,7 +9570,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9643,58 +9643,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -9725,36 +9725,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -9769,44 +9769,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9829,46 +9829,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.796078" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="0.796078" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="227,0,185,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="227,0,185,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9891,15 +9891,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9910,34 +9910,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" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -9952,151 +9952,151 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="8" dist="0" placement="1" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="8" placement="1" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="4" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="227,0,185,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="227,0,185,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="4" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.10000000000000001" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10111,89 +10111,89 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="1" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="2" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="2" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -10202,145 +10202,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10348,48 +10348,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10420,9 +10420,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10430,83 +10430,83 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="10" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="position" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10582,7 +10582,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Polygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10657,58 +10657,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -10739,36 +10739,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -10783,44 +10783,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10843,38 +10843,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,85,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,85,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,85,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,85,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,85,0,255" k="color"/>
@@ -10889,9 +10889,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10902,13 +10902,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10916,48 +10916,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10988,9 +10988,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10998,64 +10998,64 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="1" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="1" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -11064,50 +11064,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
+        <alias name="" index="5" field="fence_len"/>
       </aliases>
       <defaults>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="group" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
-        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="415" name="name" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
+          <column name="name" hidden="0" type="field" width="415"/>
+          <column name="group" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="cone_len" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="fence_len" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11139,18 +11139,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="fence_len" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="cone_len" reuseLastValue="0"/>
@@ -11164,7 +11164,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11229,7 +11229,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11243,26 +11243,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" length="-1" type="6"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0"/>
+        <field name="cone_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" version="3.8.3-Zanzibar" simplifyAlgorithm="0" maxScale="0" simplifyLocal="1" simplifyDrawingTol="1" styleCategories="AllStyleCategories" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="1e+08" simplifyDrawingHints="1">
+          <qgis simplifyLocal="1" version="3.8.3-Zanzibar" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" readOnly="0" simplifyDrawingHints="1" maxScale="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" type="RuleRenderer">
+            <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol clip_to_extent="1" alpha="1" name="0" force_rhr="0" type="line">
-                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <symbol clip_to_extent="1" name="0" type="line" alpha="1" force_rhr="0">
+                  <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                     <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"/>
@@ -11281,9 +11281,9 @@ def my_form_open(dialog, layer, feature):
                     <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11292,64 +11292,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" namedStyle="Regular" fontLetterSpacing="0" previewBkgrdColor="#ffffff" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontCapitals="0" fieldName="comment" blendMode="0" fontWeight="50" fontStrikeout="0" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" textOpacity="0.8" fontUnderline="0">
-                      <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                      <background shapeOpacity="0.6" shapeBorderWidth="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeRadiiY="1" shapeType="0"/>
-                      <shadow shadowOpacity="0.7" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1"/>
+                    <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" multilineHeight="1" blendMode="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontLetterSpacing="0" fontUnderline="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" fieldName="comment" isExpression="0" fontWeight="50" fontCapitals="0" textOpacity="0.8">
+                      <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeType="0" shapeBorderColor="255,255,0,255" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeJoinStyle="128" shapeOpacity="0.6" shapeRadiiY="1" shapeDraw="1"/>
+                      <shadow shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" addDirectionSymbol="0" wrapChar="" reverseDirectionSymbol="0"/>
-                    <placement maxCurvedCharAngleOut="-25" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" priority="5" geometryGeneratorType="PointGeometry" dist="5" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" placement="4" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetUnits="MM" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" repeatDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleIn="25" centroidWhole="0"/>
-                    <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="1" obstacleType="0" minFeatureSize="0" displayAll="1" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" multilineAlign="4294967295" autoWrapLength="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+                    <placement distUnits="MM" repeatDistanceUnits="MM" yOffset="0" rotationAngle="0" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" centroidWhole="0" priority="5" maxCurvedCharAngleOut="-25" dist="5" geometryGeneratorEnabled="0" quadOffset="4" offsetType="0" maxCurvedCharAngleIn="25" offsetUnits="MM" preserveRotation="1" placement="4" repeatDistance="0"/>
+                    <rendering drawLabels="1" minFeatureSize="0" scaleMin="0" scaleMax="0" obstacle="1" fontMinPixelSize="3" displayAll="1" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="1" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontCapitals="0" fieldName="round( $length, 1) || 'm'" blendMode="0" fontWeight="63" fontStrikeout="0" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" textOpacity="1" fontUnderline="0">
-                      <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                      <background shapeOpacity="1" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeRadiiY="0" shapeType="0"/>
-                      <shadow shadowOpacity="0.7" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1"/>
+                    <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" multilineHeight="1" blendMode="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontLetterSpacing="0" fontUnderline="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" useSubstitutions="0" fieldName="round( $length, 1) || 'm'" isExpression="1" fontWeight="63" fontCapitals="0" textOpacity="1">
+                      <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiY="0" shapeDraw="0"/>
+                      <shadow shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" addDirectionSymbol="0" wrapChar="" reverseDirectionSymbol="0"/>
-                    <placement maxCurvedCharAngleOut="-25" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" priority="5" geometryGeneratorType="PointGeometry" dist="1" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetUnits="MM" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" repeatDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleIn="25" centroidWhole="0"/>
-                    <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" obstacleType="0" minFeatureSize="0" displayAll="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" multilineAlign="4294967295" autoWrapLength="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+                    <placement distUnits="MM" repeatDistanceUnits="MM" yOffset="0" rotationAngle="0" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" centroidWhole="0" priority="5" maxCurvedCharAngleOut="-25" dist="1" geometryGeneratorEnabled="0" quadOffset="4" offsetType="0" maxCurvedCharAngleIn="25" offsetUnits="MM" preserveRotation="1" placement="2" repeatDistance="0"/>
+                    <rendering drawLabels="1" minFeatureSize="0" scaleMin="0" scaleMax="0" obstacle="1" fontMinPixelSize="3" displayAll="0" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11357,30 +11357,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory penAlpha="255" opacity="1" width="15" penColor="#000000" diagramOrientation="Up" barWidth="5" enabled="0" sizeScale="3x:0,0,0,0,0,0" height="15" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" minimumSize="0" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" scaleDependency="Area" minScaleDenominator="0">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute color="#000000" field="" label=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory scaleDependency="Area" height="15" rotationOffset="270" minScaleDenominator="0" opacity="1" labelPlacementMethod="XHeight" backgroundAlpha="255" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute label="" color="#000000" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" zIndex="0">
+            <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -11464,81 +11464,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias name="" index="0" field="id"/>
+              <alias name="" index="1" field="group"/>
+              <alias name="" index="2" field="comment"/>
+              <alias name="" index="3" field="moveable"/>
+              <alias name="" index="4" field="type"/>
+              <alias name="" index="5" field="name"/>
+              <alias name="" index="6" field="hidden"/>
+              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
+              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
+              <alias name="" index="9" field="fence_len"/>
+              <alias name="" index="10" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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"/>
+              <default applyOnUpdate="0" expression="" field="id"/>
+              <default applyOnUpdate="0" expression="" field="group"/>
+              <default applyOnUpdate="0" expression="" field="comment"/>
+              <default applyOnUpdate="0" expression="" field="moveable"/>
+              <default applyOnUpdate="0" expression="" field="type"/>
+              <default applyOnUpdate="0" expression="" field="name"/>
+              <default applyOnUpdate="0" expression="" field="hidden"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
+              <default applyOnUpdate="0" expression="" field="fence_len"/>
+              <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="id"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="group"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="comment"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="moveable"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="type"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="hidden"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="fence_len"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint desc="" field="id" exp=""/>
+              <constraint desc="" field="group" exp=""/>
+              <constraint desc="" field="comment" exp=""/>
+              <constraint desc="" field="moveable" exp=""/>
+              <constraint desc="" field="type" exp=""/>
+              <constraint desc="" field="name" exp=""/>
+              <constraint desc="" field="hidden" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
+              <constraint desc="" field="fence_len" exp=""/>
+              <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" precision="0" typeName="double precision" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" length="-1" type="6"/>
-              <field comment="" precision="0" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" length="-1" type="6"/>
-              <field comment="" precision="0" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" length="-1" type="6"/>
+              <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0"/>
+              <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0"/>
+              <field name="cone_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
               <columns>
-                <column hidden="0" width="-1" name="id" type="field"/>
-                <column hidden="0" width="-1" name="group" type="field"/>
+                <column hidden="0" name="id" width="-1" type="field"/>
+                <column hidden="0" name="group" width="-1" type="field"/>
                 <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" name="comment" type="field"/>
-                <column hidden="0" width="-1" name="moveable" type="field"/>
-                <column hidden="0" width="-1" name="type" type="field"/>
-                <column hidden="0" width="414" name="name" type="field"/>
-                <column hidden="0" width="-1" name="hidden" type="field"/>
-                <column hidden="0" width="-1" name="fence_len" type="field"/>
-                <column hidden="0" width="-1" name="cone_len" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positiony" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positionx" type="field"/>
+                <column hidden="0" name="comment" width="223" type="field"/>
+                <column hidden="0" name="moveable" width="-1" type="field"/>
+                <column hidden="0" name="type" width="-1" type="field"/>
+                <column hidden="0" name="name" width="414" type="field"/>
+                <column hidden="0" name="hidden" width="-1" type="field"/>
+                <column hidden="0" name="fence_len" width="-1" type="field"/>
+                <column hidden="0" name="cone_len" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positiony" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positionx" width="-1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11569,32 +11569,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <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"/>
+              <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"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -11611,58 +11611,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -11693,36 +11693,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -11737,44 +11737,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -11797,64 +11797,64 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0" referencescale="-1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule symbol="3" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Is Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
-          <rule symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Is Visible" checkstate="0" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" checkstate="0" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="1;4" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="Point" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dot" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="1;4" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="Point" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dot" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11885,56 +11885,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="4;3" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="4;3" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11965,56 +11965,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12045,56 +12045,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="line">
+          <symbol name="3" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12125,56 +12125,56 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="line">
+          <symbol name="4" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12205,50 +12205,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="5" force_rhr="0" type="line">
+          <symbol name="5" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12279,9 +12279,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12290,34 +12290,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{39bfb314-1cf0-4ad7-9317-85df81083977}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{95ff248f-4d20-4914-90b5-ff48b94b38a0}">
+          <rule key="{95ff248f-4d20-4914-90b5-ff48b94b38a0}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="11" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="comment" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.80000000000000004" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="comment" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="0.80000000000000004" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.59999999999999998" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="255,255,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="0.59999999999999998" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="0.59999999999999998" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="255,255,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.6" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="255,255,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.6" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12332,118 +12332,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="4294967295" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="14" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="5" dist="5" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="1" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8200000000000001" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="5" placement="2" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="5" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8200000000000001" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="1" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{ef0e96b4-ef80-4bde-9260-81fbd496b3f7}">
+          <rule key="{ef0e96b4-ef80-4bde-9260-81fbd496b3f7}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="11" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12466,34 +12466,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12508,112 +12508,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="14" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="6" dist="1" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="6" placement="2" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{20c54c85-a61c-42da-a678-6dc9932e9e61}">
+          <rule key="{20c54c85-a61c-42da-a678-6dc9932e9e61}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="11" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12636,34 +12636,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12678,72 +12678,72 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="14" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="6" dist="1" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="6" placement="2" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -12752,13 +12752,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -12766,48 +12766,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -12838,9 +12838,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12848,86 +12848,86 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="comment">
+        <field name="comment" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="moveable">
+        <field name="moveable" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="hidden">
+        <field name="hidden" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12936,74 +12936,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="comment"/>
+        <alias name="" index="3" field="moveable"/>
+        <alias name="" index="4" field="type"/>
+        <alias name="" index="5" field="name"/>
+        <alias name="" index="6" field="hidden"/>
+        <alias name="" index="7" field="day"/>
+        <alias name="" index="8" field="fence_len"/>
+        <alias name="" index="9" field="cone_len"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="group" expression="" applyOnUpdate="0"/>
-        <default field="comment" expression="" applyOnUpdate="0"/>
-        <default field="moveable" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="hidden" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="fence_len" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="comment"/>
+        <default applyOnUpdate="0" expression="" field="moveable"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="hidden"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="comment"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="moveable"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" length="-1" type="6"/>
-        <field precision="0" comment="" typeName="double precision" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" length="-1" type="6"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0"/>
+        <field name="fence_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0"/>
+        <field name="cone_len" precision="0" typeName="double precision" type="6" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="373" name="comment" type="field"/>
-          <column hidden="0" width="-1" name="moveable" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="692" name="name" type="field"/>
-          <column hidden="0" width="-1" name="hidden" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="group" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="comment" hidden="0" type="field" width="373"/>
+          <column name="moveable" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="692"/>
+          <column name="hidden" hidden="0" type="field" width="-1"/>
+          <column name="fence_len" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="cone_len" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13035,34 +13035,34 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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="1" name="day"/>
-        <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"/>
+        <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="day" editable="1"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="comment" reuseLastValue="0"/>
@@ -13081,7 +13081,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13154,58 +13154,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13236,36 +13236,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -13280,44 +13280,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13340,54 +13340,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,178,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,178,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13418,9 +13418,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13431,11 +13431,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13443,48 +13443,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -13515,9 +13515,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13525,23 +13525,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13550,25 +13550,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13600,10 +13600,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13611,7 +13611,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="100000" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13684,58 +13684,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13766,36 +13766,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="213,180,60,255" k="color"/>
@@ -13810,44 +13810,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13870,38 +13870,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="26,0,201,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="dot" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="26,0,201,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="dot" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="26,0,201,255" k="color"/>
@@ -13916,9 +13916,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13929,9 +13929,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -13943,7 +13943,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13951,48 +13951,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14023,9 +14023,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14033,59 +14033,59 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties" type="Map">
               <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+                <Option name="active" value="true" type="bool"/>
+                <Option name="field" value="id" type="QString"/>
+                <Option name="type" value="2" type="int"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -14094,40 +14094,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="page" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="page" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14159,14 +14159,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14174,7 +14174,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -14239,7 +14239,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14250,7 +14250,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join targetFieldName="position" memoryCache="0" editable="0" upsertOnEdit="0" cascadedDelete="0" joinFieldName="position" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" hasCustomPrefix="1">
+        <join customPrefix="csv_" targetFieldName="position" joinFieldName="position" cascadedDelete="0" hasCustomPrefix="1" editable="0" memoryCache="0" dynamicForm="0" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14277,58 +14277,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="id">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="id" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="114,155,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="114,155,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14359,36 +14359,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -14403,44 +14403,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14463,51 +14463,51 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" description="Show in marshal overview" label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule symbol="1" checkstate="0" label="Always show in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule symbol="2" description="Show in marshal overview" checkstate="0" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan" symbol="1" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" checkstate="0" symbol="2" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.8" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="0.8" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14530,42 +14530,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.8" is_animated="0" name="1" force_rhr="0" type="marker">
+          <symbol name="1" clip_to_extent="1" type="marker" is_animated="0" alpha="0.8" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14588,42 +14588,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="0.01" is_animated="0" name="2" force_rhr="0" type="marker">
+          <symbol name="2" clip_to_extent="1" type="marker" is_animated="0" alpha="0.01" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14646,9 +14646,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14657,42 +14657,42 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{a69c392f-7c45-4a75-a992-731572d96e04}">
-          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}">
+          <rule key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.10000000000000001" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14715,34 +14715,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14757,118 +14757,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="1" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="2" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="2" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}">
+          <rule key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.10000000000000001" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14891,34 +14891,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14933,110 +14933,110 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="1" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="2" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="1" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="2" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </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" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{a55220d0-6cca-4356-8b73-4d8675ee164b}">
+          <rule key="{a55220d0-6cca-4356-8b73-4d8675ee164b}" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.5" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.5" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.5" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15051,181 +15051,181 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="8" dist="0" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="5" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="8" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="5" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </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" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}">
+          <rule key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="6" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.59999999999999998" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="0.59999999999999998" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.59999999999999998" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15240,181 +15240,181 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="8" dist="0" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="5" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="8" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="5" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}">
+          <rule key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" active="0">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="position" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="position" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.40000000000000002" shapeOpacity="0.90000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="255,255,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="3" shapeRadiiY="0">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="3" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0.40000000000000002" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="0.90000000000000002" shapeDraw="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,0,255" k="color"/>
@@ -15429,149 +15429,149 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="0" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="0" labelPerPart="0" zIndex="10" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="10" placement="0" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="0" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="10" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -15580,9 +15580,9 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -15593,142 +15593,142 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -15736,48 +15736,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -15808,9 +15808,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15818,132 +15818,132 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="xyposition">
+        <field name="xyposition" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_position">
+        <field name="csv_position" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_club">
+        <field name="csv_club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_firstname">
+        <field name="csv_firstname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_surname">
+        <field name="csv_surname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_days">
+        <field name="csv_days" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_first_runner">
+        <field name="csv_first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_last_runner">
+        <field name="csv_last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_instructions">
+        <field name="csv_instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15952,90 +15952,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_position" index="6" name=""/>
-        <alias field="csv_club" index="7" name=""/>
-        <alias field="csv_firstname" index="8" name=""/>
-        <alias field="csv_surname" index="9" name=""/>
-        <alias field="csv_days" index="10" name=""/>
-        <alias field="csv_first_runner" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="xyposition"/>
+        <alias name="" index="5" field="day"/>
+        <alias name="" index="6" field="csv_position"/>
+        <alias name="" index="7" field="csv_club"/>
+        <alias name="" index="8" field="csv_firstname"/>
+        <alias name="" index="9" field="csv_surname"/>
+        <alias name="" index="10" field="csv_days"/>
+        <alias name="" index="11" field="csv_first_runner"/>
+        <alias name="" index="12" field="csv_last_runner"/>
+        <alias name="" index="13" field="csv_instructions"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="position" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="notes" expression="" applyOnUpdate="0"/>
-        <default field="xyposition" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="csv_position" expression="" applyOnUpdate="0"/>
-        <default field="csv_club" expression="" applyOnUpdate="0"/>
-        <default field="csv_firstname" expression="" applyOnUpdate="0"/>
-        <default field="csv_surname" expression="" applyOnUpdate="0"/>
-        <default field="csv_days" 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"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="notes"/>
+        <default applyOnUpdate="0" expression="" field="xyposition"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="csv_position"/>
+        <default applyOnUpdate="0" expression="" field="csv_club"/>
+        <default applyOnUpdate="0" expression="" field="csv_firstname"/>
+        <default applyOnUpdate="0" expression="" field="csv_surname"/>
+        <default applyOnUpdate="0" expression="" field="csv_days"/>
+        <default applyOnUpdate="0" expression="" field="csv_first_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="notes" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="xyposition" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_club" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_firstname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_surname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_days" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_first_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_last_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_instructions" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="notes"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="xyposition"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_club"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_firstname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_surname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_days"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_first_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_last_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="csv_instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="xyposition" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="csv_position" exp="" desc=""/>
-        <constraint field="csv_club" exp="" desc=""/>
-        <constraint field="csv_firstname" exp="" desc=""/>
-        <constraint field="csv_surname" exp="" desc=""/>
-        <constraint field="csv_days" exp="" desc=""/>
-        <constraint field="csv_first_runner" exp="" desc=""/>
-        <constraint field="csv_last_runner" exp="" desc=""/>
-        <constraint field="csv_instructions" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="notes" exp=""/>
+        <constraint desc="" field="xyposition" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="csv_position" exp=""/>
+        <constraint desc="" field="csv_club" exp=""/>
+        <constraint desc="" field="csv_firstname" exp=""/>
+        <constraint desc="" field="csv_surname" exp=""/>
+        <constraint desc="" field="csv_days" exp=""/>
+        <constraint desc="" field="csv_first_runner" exp=""/>
+        <constraint desc="" field="csv_last_runner" exp=""/>
+        <constraint desc="" field="csv_instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="notes" type="field"/>
-          <column hidden="0" width="-1" name="xyposition" type="field"/>
-          <column hidden="0" width="-1" name="csv_club" type="field"/>
-          <column hidden="0" width="-1" name="csv_first_runner" type="field"/>
-          <column hidden="0" width="-1" name="csv_last_runner" type="field"/>
-          <column hidden="0" width="-1" name="csv_firstname" type="field"/>
-          <column hidden="0" width="-1" name="csv_surname" type="field"/>
-          <column hidden="0" width="-1" name="csv_position" type="field"/>
-          <column hidden="0" width="-1" name="csv_days" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="csv_instructions" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="notes" hidden="0" type="field" width="-1"/>
+          <column name="xyposition" hidden="0" type="field" width="-1"/>
+          <column name="csv_club" hidden="0" type="field" width="-1"/>
+          <column name="csv_first_runner" hidden="0" type="field" width="-1"/>
+          <column name="csv_last_runner" hidden="0" type="field" width="-1"/>
+          <column name="csv_firstname" hidden="0" type="field" width="-1"/>
+          <column name="csv_surname" hidden="0" type="field" width="-1"/>
+          <column name="csv_position" hidden="0" type="field" width="-1"/>
+          <column name="csv_days" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="csv_instructions" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16067,76 +16067,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_email"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_days"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_firstname"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="csv_surname"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_email" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_days" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_firstname" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="csv_surname" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="csv_captain" reuseLastValue="0"/>
@@ -16209,7 +16209,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" wkbType="NoGeometry" refreshOnNotifyMessage="" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" type="vector">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" type="vector" readOnly="0" maxScale="100000" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" geometry="No geometry" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16262,7 +16262,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16290,58 +16290,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -16372,36 +16372,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -16416,44 +16416,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -16476,9 +16476,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16487,142 +16487,142 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="first_name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="first_name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="club">
+        <field name="club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="firstname">
+        <field name="firstname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="surname">
+        <field name="surname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="phone">
+        <field name="phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="email">
+        <field name="email" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain">
+        <field name="captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_phone">
+        <field name="captain_phone" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_email">
+        <field name="captain_email" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="days">
+        <field name="days" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runner">
+        <field name="first_runner" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runner">
+        <field name="last_runner" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="instructions">
+        <field name="instructions" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16631,94 +16631,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="club" index="1" name=""/>
-        <alias field="firstname" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="name" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="captain_email" index="9" name=""/>
-        <alias field="days" index="10" name=""/>
-        <alias field="races" index="11" name=""/>
-        <alias field="first_runner" index="12" name=""/>
-        <alias field="last_runner" index="13" name=""/>
-        <alias field="instructions" index="14" name=""/>
+        <alias name="" index="0" field="position"/>
+        <alias name="" index="1" field="club"/>
+        <alias name="" index="2" field="firstname"/>
+        <alias name="" index="3" field="surname"/>
+        <alias name="" index="4" field="name"/>
+        <alias name="" index="5" field="phone"/>
+        <alias name="" index="6" field="email"/>
+        <alias name="" index="7" field="captain"/>
+        <alias name="" index="8" field="captain_phone"/>
+        <alias name="" index="9" field="captain_email"/>
+        <alias name="" index="10" field="days"/>
+        <alias name="" index="11" field="races"/>
+        <alias name="" index="12" field="first_runner"/>
+        <alias name="" index="13" field="last_runner"/>
+        <alias name="" index="14" field="instructions"/>
       </aliases>
       <defaults>
-        <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="days" 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"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="club"/>
+        <default applyOnUpdate="0" expression="" field="firstname"/>
+        <default applyOnUpdate="0" expression="" field="surname"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="phone"/>
+        <default applyOnUpdate="0" expression="" field="email"/>
+        <default applyOnUpdate="0" expression="" field="captain"/>
+        <default applyOnUpdate="0" expression="" field="captain_phone"/>
+        <default applyOnUpdate="0" expression="" field="captain_email"/>
+        <default applyOnUpdate="0" expression="" field="days"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" expression="" field="first_runner"/>
+        <default applyOnUpdate="0" expression="" field="last_runner"/>
+        <default applyOnUpdate="0" expression="" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint field="position" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="club" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="firstname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="surname" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="phone" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="email" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_phone" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_email" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="days" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runner" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="instructions" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="club"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="firstname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="surname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="email"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain_phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain_email"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="days"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="firstname" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="captain_email" exp="" desc=""/>
-        <constraint field="days" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="club" exp=""/>
+        <constraint desc="" field="firstname" exp=""/>
+        <constraint desc="" field="surname" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="phone" exp=""/>
+        <constraint desc="" field="email" exp=""/>
+        <constraint desc="" field="captain" exp=""/>
+        <constraint desc="" field="captain_phone" exp=""/>
+        <constraint desc="" field="captain_email" exp=""/>
+        <constraint desc="" field="days" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="221" name="name" type="field"/>
-          <column hidden="0" width="-1" name="club" type="field"/>
-          <column hidden="0" width="-1" name="phone" type="field"/>
-          <column hidden="0" width="-1" name="email" type="field"/>
-          <column hidden="0" width="-1" name="captain" type="field"/>
-          <column hidden="0" width="-1" name="races" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="first_runner" type="field"/>
-          <column hidden="0" width="-1" name="last_runner" type="field"/>
-          <column hidden="0" width="-1" name="instructions" type="field"/>
-          <column hidden="0" width="-1" name="firstname" type="field"/>
-          <column hidden="0" width="-1" name="surname" type="field"/>
-          <column hidden="0" width="-1" name="captain_phone" type="field"/>
-          <column hidden="0" width="-1" name="captain_email" type="field"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="221"/>
+          <column name="club" hidden="0" type="field" width="-1"/>
+          <column name="phone" hidden="0" type="field" width="-1"/>
+          <column name="email" hidden="0" type="field" width="-1"/>
+          <column name="captain" hidden="0" type="field" width="-1"/>
+          <column name="races" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="first_runner" hidden="0" type="field" width="-1"/>
+          <column name="last_runner" hidden="0" type="field" width="-1"/>
+          <column name="instructions" hidden="0" type="field" width="-1"/>
+          <column name="firstname" hidden="0" type="field" width="-1"/>
+          <column name="surname" hidden="0" type="field" width="-1"/>
+          <column name="captain_phone" hidden="0" type="field" width="-1"/>
+          <column name="captain_email" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16750,42 +16750,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16793,7 +16793,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16858,7 +16858,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16883,58 +16883,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="141,90,153,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="141,90,153,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -16965,36 +16965,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="141,90,153,255" k="color"/>
@@ -17009,44 +17009,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17069,58 +17069,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17151,50 +17151,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -17225,30 +17225,30 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -17268,33 +17268,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@1" force_rhr="0" type="marker">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -17310,32 +17310,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -17350,9 +17350,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17365,11 +17365,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -17377,48 +17377,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -17449,9 +17449,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17459,30 +17459,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17491,30 +17491,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17546,12 +17546,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17559,7 +17559,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17624,7 +17624,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17649,58 +17649,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="232,113,141,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="232,113,141,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17731,36 +17731,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="232,113,141,255" k="color"/>
@@ -17775,44 +17775,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17835,44 +17835,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8.5" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="name" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.75" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8.5" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="name" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="0.75" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1.5" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1.5" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -17887,109 +17887,109 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties" type="Map">
                   <Option name="LabelRotation" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                   <Option name="PositionX" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_x" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_x" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
                   <Option name="PositionY" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_y" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_y" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="2" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="1" dist="0" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="0.20000000000000001" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="1" placement="6" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="0.20000000000000001" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;name&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;name&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -17997,48 +17997,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18069,9 +18069,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18079,173 +18079,173 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="osm_id"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="type"/>
+        <alias name="" index="4" field="z_order"/>
+        <alias name="" index="5" field="population"/>
+        <alias name="" index="6" field="label_x"/>
+        <alias name="" index="7" field="label_y"/>
+        <alias name="" index="8" field="label_rota"/>
       </aliases>
       <defaults>
-        <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"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="population"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="population" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="population"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="population" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="0" width="-1" name="population" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="osm_id" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="z_order" hidden="0" type="field" width="-1"/>
+          <column name="population" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="label_x" hidden="0" type="field" width="-1"/>
+          <column name="label_y" hidden="0" type="field" width="-1"/>
+          <column name="label_rota" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18277,26 +18277,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18304,7 +18304,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18369,7 +18369,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18394,58 +18394,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,158,23,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,158,23,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -18476,36 +18476,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,158,23,255" k="color"/>
@@ -18520,44 +18520,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -18580,52 +18580,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="7" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.80000000000000004" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="7" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="50" textOpacity="0.80000000000000004" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="0"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="196,60,57,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="196,60,57,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -18648,34 +18648,34 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -18690,106 +18690,106 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="LineGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MapUnit" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="4" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="3" dist="0" placement="3" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="1" drawLabels="1" unplacedVisibility="0" obstacleFactor="0.29999999999999999" obstacleType="0" minFeatureSize="5" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="3" placement="3" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="4" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MapUnit" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="1" minFeatureSize="5" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="0.29999999999999999" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="1" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="AlwaysShow" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="always_sho" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="always_sho" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="IsObstacle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="&quot;&quot;" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="&quot;&quot;" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="Priority" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
                 <Option name="Show" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="auxiliary_storage_labeling_show" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -18801,7 +18801,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -18809,48 +18809,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18881,9 +18881,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18891,137 +18891,137 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="highway">
+        <field name="highway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="waterway">
+        <field name="waterway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="aerialway">
+        <field name="aerialway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="barrier">
+        <field name="barrier" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="man_made">
+        <field name="man_made" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="other_tags">
+        <field name="other_tags" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="never_show">
+        <field name="never_show" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="always_sho">
+        <field name="always_sho" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="resident_a">
+        <field name="resident_a" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
+        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -19030,100 +19030,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias name="" index="0" field="osm_id"/>
+        <alias name="" index="1" field="name"/>
+        <alias name="" index="2" field="highway"/>
+        <alias name="" index="3" field="waterway"/>
+        <alias name="" index="4" field="aerialway"/>
+        <alias name="" index="5" field="barrier"/>
+        <alias name="" index="6" field="man_made"/>
+        <alias name="" index="7" field="z_order"/>
+        <alias name="" index="8" field="other_tags"/>
+        <alias name="" index="9" field="never_show"/>
+        <alias name="" index="10" field="label_x"/>
+        <alias name="" index="11" field="label_y"/>
+        <alias name="" index="12" field="label_rota"/>
+        <alias name="" index="13" field="always_sho"/>
+        <alias name="" index="14" field="resident_a"/>
+        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <defaults>
-        <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"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="highway"/>
+        <default applyOnUpdate="0" expression="" field="waterway"/>
+        <default applyOnUpdate="0" expression="" field="aerialway"/>
+        <default applyOnUpdate="0" expression="" field="barrier"/>
+        <default applyOnUpdate="0" expression="" field="man_made"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="other_tags"/>
+        <default applyOnUpdate="0" expression="" field="never_show"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="always_sho"/>
+        <default applyOnUpdate="0" expression="" field="resident_a"/>
+        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="highway" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="waterway" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="aerialway" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="barrier" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="man_made" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="other_tags" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="never_show" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="always_sho" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="resident_a" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="highway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="waterway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="aerialway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="barrier"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="man_made"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="other_tags"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="never_show"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="always_sho"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="resident_a"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_show"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="highway" exp=""/>
+        <constraint desc="" field="waterway" exp=""/>
+        <constraint desc="" field="aerialway" exp=""/>
+        <constraint desc="" field="barrier" exp=""/>
+        <constraint desc="" field="man_made" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="other_tags" exp=""/>
+        <constraint desc="" field="never_show" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" field="always_sho" exp=""/>
+        <constraint desc="" field="resident_a" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="160" name="name" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="highway" type="field"/>
-          <column hidden="0" width="-1" name="waterway" type="field"/>
-          <column hidden="0" width="-1" name="aerialway" type="field"/>
-          <column hidden="0" width="-1" name="barrier" type="field"/>
-          <column hidden="0" width="-1" name="man_made" type="field"/>
-          <column hidden="0" width="142" name="other_tags" type="field"/>
-          <column hidden="0" width="-1" name="never_show" type="field"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
-          <column hidden="0" width="-1" name="always_sho" type="field"/>
-          <column hidden="0" width="-1" name="resident_a" type="field"/>
-          <column hidden="0" width="-1" name="auxiliary_storage_labeling_show" type="field"/>
+          <column name="osm_id" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="160"/>
+          <column name="z_order" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="highway" hidden="0" type="field" width="-1"/>
+          <column name="waterway" hidden="0" type="field" width="-1"/>
+          <column name="aerialway" hidden="0" type="field" width="-1"/>
+          <column name="barrier" hidden="0" type="field" width="-1"/>
+          <column name="man_made" hidden="0" type="field" width="-1"/>
+          <column name="other_tags" hidden="0" type="field" width="142"/>
+          <column name="never_show" hidden="0" type="field" width="-1"/>
+          <column name="label_x" hidden="0" type="field" width="-1"/>
+          <column name="label_y" hidden="0" type="field" width="-1"/>
+          <column name="label_rota" hidden="0" type="field" width="-1"/>
+          <column name="always_sho" hidden="0" type="field" width="-1"/>
+          <column name="resident_a" hidden="0" type="field" width="-1"/>
+          <column name="auxiliary_storage_labeling_show" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19155,76 +19155,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="aerialway" reuseLastValue="0"/>
@@ -19292,7 +19292,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="0" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19357,7 +19357,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19382,58 +19382,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="231,113,72,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="231,113,72,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -19464,36 +19464,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="231,113,72,255" k="color"/>
@@ -19508,44 +19508,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19568,54 +19568,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1" filter="&quot;type&quot; = 'toilets'"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2" filter="&quot;type&quot; = 'togbag'"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3" filter=" &quot;type&quot; = 'closure'"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4" filter="&quot;type&quot; = 'myciti'"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="star" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.5" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="name" value="star" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.5" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19638,47 +19638,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="marker">
+          <symbol name="1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,32,80,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="amenity/amenity_toilets.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,32,80,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="amenity/amenity_toilets.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,32,80,255" k="color"/>
@@ -19700,47 +19700,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="marker">
+          <symbol name="2" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/gym-bag.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/gym-bag.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
@@ -19762,57 +19762,57 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="marker">
+          <symbol name="3" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/road_closure.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/road_closure.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="125,139,143,255" k="color"/>
@@ -19834,47 +19834,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="marker">
+          <symbol name="4" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,12,254,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/transport_bus_stop.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="255,255,255,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,12,254,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/transport_bus_stop.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="255,255,255,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
@@ -19894,21 +19894,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
               <prop v="MM" k="size_unit"/>
               <prop v="1" k="vertical_anchor_point"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -19925,24 +19925,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -19965,10 +19965,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -19977,18 +19977,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20005,24 +20005,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20046,47 +20046,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="5" force_rhr="0" type="marker">
+          <symbol name="5" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer enabled="1" class="SvgMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="43,153,41,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/amenity=parking.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="43,153,41,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/amenity=parking.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
@@ -20108,15 +20108,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20125,32 +20125,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="name" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="name" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="0.90000000000000002" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="2" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="0.69999999999999996" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="2" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="2">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="2" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="0"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="2" shapeOpacity="0.69999999999999996" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -20165,99 +20165,99 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties" type="Map">
                   <Option name="LabelDistance" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                   <Option name="OffsetQuad" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="2" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="2" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="3" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="2" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="3" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="10" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="10" placement="0" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="2" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="3" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="2" yOffset="3" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1.8" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="10" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="LabelDistance" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="OffsetQuad" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="2" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="2" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20265,48 +20265,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -20337,9 +20337,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20347,44 +20347,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20393,40 +20393,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="distance"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20458,16 +20458,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20475,7 +20475,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20548,58 +20548,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -20630,36 +20630,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -20674,44 +20674,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20734,42 +20734,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
+            <layer enabled="1" class="LinePatternFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="135" name="angle" type="QString"/>
-                <Option value="during_render" name="clip_mode" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="feature" name="coordinate_reference" type="QString"/>
-                <Option value="2" name="distance" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="distance_map_unit_scale" type="QString"/>
-                <Option value="MM" name="distance_unit" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" value="135" type="QString"/>
+                <Option name="clip_mode" value="during_render" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="coordinate_reference" value="feature" type="QString"/>
+                <Option name="distance" value="2" type="QString"/>
+                <Option name="distance_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="distance_unit" value="MM" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
               </Option>
               <prop v="135" k="angle"/>
               <prop v="during_render" k="clip_mode"/>
@@ -20788,48 +20788,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@0@0" force_rhr="0" type="line">
+              <symbol name="@0@0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="align_dash_pattern" type="QString"/>
-                    <Option value="square" name="capstyle" type="QString"/>
-                    <Option value="5;2" name="customdash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="customdash_unit" type="QString"/>
-                    <Option value="0" name="dash_pattern_offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                    <Option value="0" name="draw_inside_polygon" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="211,134,33,255" name="line_color" type="QString"/>
-                    <Option value="solid" name="line_style" type="QString"/>
-                    <Option value="0.3" name="line_width" type="QString"/>
-                    <Option value="MM" name="line_width_unit" type="QString"/>
-                    <Option value="0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0" name="ring_filter" type="QString"/>
-                    <Option value="0" name="trim_distance_end" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                    <Option value="0" name="trim_distance_start" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                    <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                    <Option value="0" name="use_custom_dash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                    <Option name="align_dash_pattern" value="0" type="QString"/>
+                    <Option name="capstyle" value="square" type="QString"/>
+                    <Option name="customdash" value="5;2" type="QString"/>
+                    <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="customdash_unit" value="MM" type="QString"/>
+                    <Option name="dash_pattern_offset" value="0" type="QString"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                    <Option name="draw_inside_polygon" value="0" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="line_color" value="211,134,33,255" type="QString"/>
+                    <Option name="line_style" value="solid" type="QString"/>
+                    <Option name="line_width" value="0.3" type="QString"/>
+                    <Option name="line_width_unit" value="MM" type="QString"/>
+                    <Option name="offset" value="0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="ring_filter" value="0" type="QString"/>
+                    <Option name="trim_distance_end" value="0" type="QString"/>
+                    <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                    <Option name="trim_distance_start" value="0" type="QString"/>
+                    <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                    <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                    <Option name="use_custom_dash" value="0" type="QString"/>
+                    <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
                   <prop v="0" k="align_dash_pattern"/>
                   <prop v="square" k="capstyle"/>
@@ -20860,27 +20860,27 @@ def my_form_open(dialog, layer, feature):
                   <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.46" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="no" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.46" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="no" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="211,134,33,255" k="color"/>
@@ -20895,9 +20895,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20908,11 +20908,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20920,48 +20920,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -20992,9 +20992,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21002,23 +21002,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="1" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="1" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -21027,26 +21027,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <defaults>
-        <default field="FID" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="FID"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="431" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21078,12 +21078,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21091,7 +21091,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21156,7 +21156,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21181,58 +21181,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,207,80,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,207,80,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21263,36 +21263,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,207,80,255" k="color"/>
@@ -21307,44 +21307,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -21367,61 +21367,61 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0" filter="&quot;status&quot; = 'open'"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3" filter="&quot;status&quot; = 'one-way'"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21452,50 +21452,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="2" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="2" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21515,40 +21515,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@0" force_rhr="0" type="marker">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,255,0,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="1" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,255,0,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="1" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21571,52 +21571,52 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="2" force_rhr="0" type="line">
+          <symbol name="2" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="2;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash dot dot" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="2;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash dot dot" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21647,41 +21647,41 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21701,46 +21701,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@2@1" force_rhr="0" type="marker">
+              <symbol name="@2@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21763,58 +21763,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="3" force_rhr="0" type="line">
+          <symbol name="3" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="3;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="3;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21845,41 +21845,41 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21899,46 +21899,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@3@1" force_rhr="0" type="marker">
+              <symbol name="@3@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21961,58 +21961,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="4" force_rhr="0" type="line">
+          <symbol name="4" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22043,20 +22043,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22065,32 +22065,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="9" namedStyle="Regular" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="times" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Regular" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="9" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="times" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="50" textOpacity="1" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -22105,67 +22105,67 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="4294967295" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="0" placement="2" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="5" placement="2" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -22173,48 +22173,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -22245,9 +22245,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22255,44 +22255,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="status">
+        <field name="status" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="times">
+        <field name="times" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -22301,40 +22301,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="status"/>
+        <alias name="" index="3" field="times"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="status" expression="" applyOnUpdate="0"/>
-        <default field="times" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="status" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="times" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="status"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="times"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="202" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="status" type="field"/>
-          <column hidden="0" width="-1" name="times" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="status" hidden="0" type="field" width="-1"/>
+          <column name="times" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22366,16 +22366,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22383,7 +22383,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="100000" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="100000" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -22456,58 +22456,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22538,36 +22538,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -22582,44 +22582,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -22642,54 +22642,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{4da76d50-b431-43d2-8f08-7664d5762a1c}">
-          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" key="{f3d8c637-3bb6-4249-ba55-f0c57bee5e55}">
+          <rule key="{f3d8c637-3bb6-4249-ba55-f0c57bee5e55}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22712,34 +22712,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -22754,138 +22754,138 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{839f054f-e86d-4118-a253-e1d5c81234fa}">
+          <rule key="{839f054f-e86d-4118-a253-e1d5c81234fa}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="0,0,0,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22908,34 +22908,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -22950,131 +22950,131 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+              <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{905e8a77-980c-42e8-94ac-662ad263ccb8}">
-            <rule description="21KM" active="0" filter="&quot;Source&quot; = '21KM'" key="{9ed61d0c-920f-41ee-848c-d0202cb5c55a}">
+          <rule key="{905e8a77-980c-42e8-94ac-662ad263ccb8}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0">
+            <rule key="{9ed61d0c-920f-41ee-848c-d0202cb5c55a}" filter="&quot;Source&quot; = '21KM'" description="21KM" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="210,32,39,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="210,32,39,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="210,32,39,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="210,32,39,255" k="color"/>
@@ -23089,130 +23089,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="3" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" active="0" filter="&quot;Source&quot; = '10KM'" key="{b1e8ae3d-36ba-4724-a299-5faba67854ef}">
+            <rule key="{b1e8ae3d-36ba-4724-a299-5faba67854ef}" filter="&quot;Source&quot; = '10KM'" description="10KM" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="103,34,144,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="103,34,144,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="103,34,144,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="103,34,144,255" k="color"/>
@@ -23227,130 +23227,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" active="0" filter="&quot;Source&quot; = '5KM'" key="{6e7154e1-bcb8-4b17-8bf0-66341d4599dd}">
+            <rule key="{6e7154e1-bcb8-4b17-8bf0-66341d4599dd}" filter="&quot;Source&quot; = '5KM'" description="5KM" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="145,211,55,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="145,211,55,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="145,211,55,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="145,211,55,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="145,211,55,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="145,211,55,255" k="color"/>
@@ -23365,138 +23365,138 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" active="0" filter="&quot;Source&quot; = 'Trail'" key="{d4116bb5-e30d-46f8-be72-731e74a92758}">
+            <rule key="{d4116bb5-e30d-46f8-be72-731e74a92758}" filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0">
               <settings calloutType="simple">
-                <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontFamily="Myriad Pro" fontSize="10" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="255,255,255,255" legendString="Aa" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+                <text-style namedStyle="Semibold" textColor="255,255,255,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" isExpression="1" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
                   <families/>
-                  <text-buffer bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                  <background shapeBorderWidth="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="1" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="1">
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="145,211,55,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeOpacity="1" shapeDraw="1">
+                    <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                      <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="133,182,111,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" name="name" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" name="outline_width" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="diameter" name="scale_method" type="QString"/>
-                          <Option value="2" name="size" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="size_unit" type="QString"/>
-                          <Option value="1" name="vertical_anchor_point" type="QString"/>
+                          <Option name="angle" value="0" type="QString"/>
+                          <Option name="cap_style" value="square" type="QString"/>
+                          <Option name="color" value="133,182,111,255" type="QString"/>
+                          <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                          <Option name="joinstyle" value="bevel" type="QString"/>
+                          <Option name="name" value="circle" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="0" type="QString"/>
+                          <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="scale_method" value="diameter" type="QString"/>
+                          <Option name="size" value="2" type="QString"/>
+                          <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="size_unit" value="MM" type="QString"/>
+                          <Option name="vertical_anchor_point" value="1" type="QString"/>
                         </Option>
                         <prop v="0" k="angle"/>
                         <prop v="square" k="cap_style"/>
@@ -23519,34 +23519,34 @@ def my_form_open(dialog, layer, feature):
                         <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="0,72,255,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="0,72,255,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="0,72,255,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="0,72,255,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="0,72,255,255" k="color"/>
@@ -23561,77 +23561,77 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="0" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-                <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-20" overrunDistance="0" layerType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="AllowOverlapIfRequired" fitInPolygonOnly="0" priority="10" dist="2" placement="6" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="1"/>
-                <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="2" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar=""/>
+                <placement priority="10" placement="6" allowDegraded="1" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-20" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" dist="2" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="20" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="2" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
@@ -23641,13 +23641,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -23655,48 +23655,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="100000" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -23727,9 +23727,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23737,157 +23737,157 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="quadrant">
+        <field name="quadrant" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -23896,95 +23896,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
+        <alias name="" index="12" field="org_fid"/>
+        <alias name="" index="13" field="distance"/>
+        <alias name="" index="14" field="quadrant"/>
       </aliases>
       <defaults>
-        <default field="Name" expression="" applyOnUpdate="0"/>
-        <default field="descriptio" expression="" applyOnUpdate="0"/>
-        <default field="timestamp" expression="" applyOnUpdate="0"/>
-        <default field="begin" expression="" applyOnUpdate="0"/>
-        <default field="end" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
-        <default field="RouteLen" expression="" applyOnUpdate="0"/>
-        <default field="Source" expression="" applyOnUpdate="0"/>
-        <default field="Sort" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
-        <default field="length_m" expression="" applyOnUpdate="0"/>
-        <default field="org_fid" expression="" applyOnUpdate="0"/>
-        <default field="distance" expression="" applyOnUpdate="0"/>
-        <default field="quadrant" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="quadrant"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="quadrant" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="quadrant"/>
       </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="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="quadrant" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="Sort" type="field"/>
-          <column hidden="0" width="-1" name="quadrant" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="-1"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="Sort" hidden="0" type="field" width="-1"/>
+          <column name="quadrant" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24016,38 +24016,38 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -24071,7 +24071,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24144,58 +24144,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24226,36 +24226,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -24270,44 +24270,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24330,38 +24330,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="fill">
+          <symbol name="0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -24376,9 +24376,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24389,39 +24389,39 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="area">
+        <field name="area" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="rotation">
+        <field name="rotation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -24430,35 +24430,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="area"/>
+        <alias name="" index="2" field="rotation"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="area" expression="" applyOnUpdate="0"/>
-        <default field="rotation" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="area" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="rotation" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="area"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="rotation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="area" exp=""/>
+        <constraint desc="" field="rotation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="area" type="field"/>
-          <column hidden="0" width="-1" name="rotation" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="area" hidden="0" type="field" width="-1"/>
+          <column name="rotation" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24481,7 +24481,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="0" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24546,7 +24546,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24571,58 +24571,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24653,36 +24653,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -24697,44 +24697,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24757,49 +24757,49 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" checkstate="0" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="marker">
+          <symbol name="0" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24822,20 +24822,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24847,15 +24847,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="StringList">
             <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" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -24863,48 +24863,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -24935,9 +24935,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24945,116 +24945,116 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
+        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
+        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runn">
+        <field name="first_runn" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runne">
+        <field name="last_runne" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25063,85 +25063,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="RouteLen"/>
+        <alias name="" index="6" field="Source"/>
+        <alias name="" index="7" field="length_m"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="org_fid"/>
+        <alias name="" index="10" field="distance"/>
+        <alias name="" index="11" field="first_runn"/>
+        <alias name="" index="12" field="last_runne"/>
       </aliases>
       <defaults>
-        <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"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="first_runn"/>
+        <default applyOnUpdate="0" expression="" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runn" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runne" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runn"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runne"/>
       </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="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=""/>
-        <constraint field="first_runn" exp="" desc=""/>
-        <constraint field="last_runne" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="first_runn" exp=""/>
+        <constraint desc="" field="last_runne" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="179" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="first_runn" type="field"/>
-          <column hidden="0" width="-1" name="last_runne" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column name="begin" hidden="0" type="field" width="179"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="first_runn" hidden="0" type="field" width="-1"/>
+          <column name="last_runne" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25173,58 +25173,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runne"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25232,7 +25232,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="0" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Line" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiLineString" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25305,58 +25305,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25387,36 +25387,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -25431,44 +25431,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25491,58 +25491,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="0" force_rhr="0" type="line">
+          <symbol name="0" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25573,50 +25573,50 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="1" force_rhr="0" type="line">
+          <symbol name="1" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -25647,30 +25647,30 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer enabled="1" class="MarkerLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -25690,33 +25690,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@1@1" force_rhr="0" type="marker">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer enabled="1" class="FilledMarker" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -25732,32 +25732,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill">
+                  <symbol name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -25772,9 +25772,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -25787,11 +25787,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -25799,48 +25799,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25871,9 +25871,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25881,30 +25881,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25913,30 +25913,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25968,12 +25968,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25981,7 +25981,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="Point" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" maxScale="0" legendPlaceholderImage="" geometry="Point" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="Point" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26054,58 +26054,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26136,36 +26136,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -26180,44 +26180,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26240,44 +26240,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="15" namedStyle="Semibold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" legendString="Aa" useSubstitutions="0" fieldName="label" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="15" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="label" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="63" textOpacity="1" legendString="Aa">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -26292,66 +26292,66 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MM" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="UnknownGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="0" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="0" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-          <rendering obstacle="1" labelPerPart="0" zIndex="0" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="1" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" limitNumLabels="0" scaleMax="0" scaleVisibility="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+          <placement priority="5" placement="0" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="4" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MM" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering drawLabels="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="1" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="0" maxNumLabels="2000" scaleVisibility="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -26359,48 +26359,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" style="0" italic="1" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="1" bold="0" underline="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -26431,9 +26431,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26441,30 +26441,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="18" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -26473,30 +26473,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="label"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="label" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="label" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26528,12 +26528,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -26541,7 +26541,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" simplifyDrawingTol="1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyLocal="1" type="vector" simplifyMaxScale="1" labelsEnabled="1" autoRefreshEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" readOnly="0" refreshOnNotifyMessage="" symbologyReferenceScale="-1">
+    <maplayer minScale="100000000" simplifyLocal="1" maxScale="0" autoRefreshEnabled="0" readOnly="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" wkbType="MultiPolygon" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" labelsEnabled="1" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" symbologyReferenceScale="-1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -26606,7 +26606,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" maxx="0" dimensions="2" miny="0" maxy="0" minz="0" maxz="0"/>
+          <spatial minx="0" minz="0" maxz="0" dimensions="2" maxy="0" miny="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -26631,58 +26631,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" startField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0" enabled="0" limitMode="0" startExpression="" mode="0" durationField="">
+      <temporal startField="" accumulate="0" mode="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" durationField="" endExpression="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" clamping="Terrain" binding="Centroid" extrusionEnabled="0" zscale="1" type="IndividualFeatures" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation extrusion="0" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid" zscale="1" zoffset="0" respectLayerSymbol="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26713,36 +26713,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -26757,44 +26757,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26817,54 +26817,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
             <settings calloutType="simple">
-              <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontFamily="Myriad Pro" fontSize="8" namedStyle="Bold" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="31,120,180,255" legendString="Aa" useSubstitutions="0" fieldName="label" blendMode="0" fontWeight="75" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="0.90000000000000002" forcedItalic="0" fontUnderline="0" forcedBold="0">
+              <text-style namedStyle="Bold" textColor="31,120,180,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontItalic="0" useSubstitutions="0" textOrientation="horizontal" fieldName="label" forcedItalic="0" isExpression="0" forcedBold="0" fontWeight="75" textOpacity="0.90000000000000002" legendString="Aa">
                 <families/>
-                <text-buffer bufferSize="0.75" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-                <background shapeBorderWidth="0.75" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0.75" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0.5" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeDraw="1" shapeFillColor="255,255,255,204" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0.5">
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="markerSymbol" force_rhr="0" type="marker">
+                <text-buffer bufferDraw="0" bufferSize="0.75" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="0"/>
+                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="31,120,206,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeBorderWidth="0.75" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0.5" shapeOpacity="0.59999999999999998" shapeDraw="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -26887,34 +26887,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,204" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="31,120,206,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.75" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,204" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="31,120,206,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.75" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,204" k="color"/>
@@ -26929,56 +26929,56 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" decimals="3" formatNumbers="0" plussign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-              <placement lineAnchorPercent="0.5" polygonPlacementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" lineAnchorClipping="0" offsetUnits="MapUnit" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleOut="-25" overrunDistance="0" layerType="PolygonGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" overrunDistanceUnit="MM" centroidInside="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" quadOffset="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" repeatDistance="0" placementFlags="10" xOffset="1" overlapHandling="PreventOverlap" fitInPolygonOnly="0" priority="5" dist="0" placement="0" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" allowDegraded="0"/>
-              <rendering obstacle="1" labelPerPart="0" zIndex="5" mergeLines="0" drawLabels="1" unplacedVisibility="0" obstacleFactor="0.76000000000000001" obstacleType="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="6" limitNumLabels="0" scaleMax="10000000" scaleVisibility="0" scaleMin="1" fontLimitPixelSize="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar=""/>
+              <placement priority="5" placement="0" allowDegraded="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="1" geometryGenerator="" lineAnchorClipping="0" overrunDistance="0" repeatDistance="0" maxCurvedCharAngleOut="-25" preserveRotation="1" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" lineAnchorPercent="0.5" fitInPolygonOnly="0" lineAnchorTextPoint="CenterOfText" layerType="PolygonGeometry" dist="0" overlapHandling="PreventOverlap" rotationAngle="0" overrunDistanceUnit="MM" quadOffset="1" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" maxCurvedCharAngleIn="25" centroidWhole="1" polygonPlacementFlags="2" repeatDistanceUnits="MM" lineAnchorType="0" offsetUnits="MapUnit" centroidInside="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering drawLabels="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacle="1" unplacedVisibility="0" fontMinPixelSize="3" obstacleType="0" obstacleFactor="0.76000000000000001" upsidedownLabels="0" fontLimitPixelSize="0" labelPerPart="0" fontMaxPixelSize="10000" limitNumLabels="0" mergeLines="0" zIndex="5" maxNumLabels="6" scaleVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&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; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -26987,16 +26987,16 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <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 value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -27004,48 +27004,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory penAlpha="255" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penColor="#000000" showAxis="0" enabled="0" diagramOrientation="Up" barWidth="5" spacingUnit="MM" height="15" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" direction="1" lineSizeType="MM" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundAlpha="255" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" maxScaleDenominator="1e+08" penWidth="0" minScaleDenominator="0" scaleDependency="Area" spacing="0">
-          <fontProperties underline="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory height="15" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" rotationOffset="270" direction="1" opacity="1" backgroundAlpha="255" labelPlacementMethod="XHeight" backgroundColor="#ffffff" enabled="0" maxScaleDenominator="1e+08" lineSizeType="MM" penAlpha="255" penColor="#000000" scaleBasedVisibility="0" spacingUnit="MM" showAxis="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" spacing="0" barWidth="5" penWidth="0" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0">
+          <fontProperties strikethrough="0" italic="0" bold="0" underline="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27076,9 +27076,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27086,66 +27086,66 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" priority="0" placement="0" linePlacementFlags="2" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" zIndex="0" dist="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27154,45 +27154,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="table_set"/>
+        <alias name="" index="2" field="label"/>
+        <alias name="" index="3" field="races"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="table_set" expression="" applyOnUpdate="0"/>
-        <default field="label" expression="" applyOnUpdate="0"/>
-        <default field="races" expression="" applyOnUpdate="0"/>
-        <default field="day" expression="" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="table_set"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="table_set" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="table_set"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="table_set" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="130" name="races" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="table_set" hidden="0" type="field" width="-1"/>
+          <column name="label" hidden="0" type="field" width="-1"/>
+          <column name="day" hidden="0" type="field" width="-1"/>
+          <column name="races" hidden="0" type="field" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27224,18 +27224,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="day" reuseLastValue="0"/>
@@ -27444,7 +27444,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan/Gun Run 2022 - Marshal Plan rev 3.1.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan/Gun Run 2022 - Marshal Plan rev 3.2.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27606,274 +27606,274 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" name="name" type="QString"/>
+      <Option name="name" value="" type="QString"/>
       <Option name="properties"/>
-      <Option value="collection" name="type" type="QString"/>
+      <Option name="type" value="collection" type="QString"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Elevation"/>
-        <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 visible="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" style="default" id="water_tables20170921142016467" expanded="1"/>
+    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <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="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" style="default" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" style="default" id="water_tables20170921142016467" expanded="1"/>
+    <visibility-preset name="Marshal overview" has-checked-group-info="1" has-expanded-info="1">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{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>
       <checked-group-nodes>
         <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" style="default" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" style="default" id="water_tables20170921142016467" expanded="1"/>
+    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" id="water_tables20170921142016467" expanded="1"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1"/>
+      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -27900,31 +27900,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshals">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Marshals" worldFileMap="" units="mm" printResolution="120">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -27939,49 +27939,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -27996,9 +27996,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28006,15 +28006,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" groupUuid="" positionOnPage="110.353,5.04491,mm" symbolWidth="7" position="110.353,5.04491,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="bevel" size="39.4312,46.1,mm" fontColor="#000000" zValue="5" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" splitLayer="0" outlineWidthM="0.1,mm" resizeToContents="1" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="128" red="128" green="128"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="bevel" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="39.4312,46.1,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="5" wmsLegendHeight="25" title="" type="65642" position="110.353,5.04491,mm" outlineWidthM="0.1,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" positionOnPage="110.353,5.04491,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="128" red="128" blue="128" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28022,48 +28022,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="1" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Unchecked" groupLayer="" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Unchecked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" source="./fencing.shp|layername=fencing" expanded="1" name="fencing" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="0,1,2" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/node-order" value="0,1,2" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28071,15 +28071,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="56.5192,54.5647,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Marshal map - inset" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="4" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" excludeFromExports="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionOnPage="98.7828,149.027,mm" followPreset="true" keepLayerSet="false" position="98.7828,149.027,mm" outlineWidthM="0.2,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" keepLayerSet="false" mapRotation="0" blendMode="0" size="56.5192,54.5647,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" outlineWidthM="0.2,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal map - inset" referencePoint="0" isTemporal="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionOnPage="98.7828,149.027,mm" visibility="1" id="" position="98.7828,149.027,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28088,45 +28088,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41064302246786966" xmax="18.41493455420295433" ymax="-33.89902512102636223" ymin="-33.90316824413850583"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28157,44 +28157,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28217,40 +28217,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28265,29 +28265,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28295,28 +28295,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" centered="1" name="Overview 1" position="3" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" show="1">
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <ComposerMapOverview name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" show="1" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" blendMode="0" centered="1">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,65,170,127" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,102" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,65,170,127" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,102" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,65,170,127" k="color"/>
@@ -28331,9 +28331,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28341,9 +28341,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28351,22 +28351,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="142,187.018,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="false" followPresetName="Marshal map - main" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="3" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" excludeFromExports="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionOnPage="3.53,6.0007,mm" followPreset="true" keepLayerSet="false" position="3.53,6.0007,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" keepLayerSet="false" mapRotation="0" blendMode="0" size="142,187.018,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal map - main" referencePoint="0" isTemporal="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionOnPage="3.53,6.0007,mm" visibility="1" id="" position="3.53,6.0007,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="false" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28375,45 +28375,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41227535330844844" xmax="18.41330222336237554" ymax="-33.90042047455022356" ymin="-33.9017728906146445"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28444,44 +28444,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28504,40 +28504,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28552,29 +28552,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28582,22 +28582,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="142.117,187.018,mm" opacity="1" frameJoinStyle="round" background="false" visibility="1" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" referencePoint="2" type="65647" sectionY="0" frame="false" id="" sectionX="0" zValue="2" sectionHeight="182.4" groupUuid="" blendMode="0" hidePageIfEmpty="0" itemRotation="0" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" excludeFromExports="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionOnPage="290.617,6.0007,mm" position="290.617,6.0007,mm" outlineWidthM="0.3,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
-        <FrameColor alpha="255" blue="119" red="119" green="119"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" sectionWidth="142.117" sectionX="0" sectionHeight="182.4" blendMode="0" size="142.117,187.018,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" outlineWidthM="0.3,mm" opacity="1" hideBackgroundIfEmpty="0" referencePoint="2" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionY="0" positionOnPage="290.617,6.0007,mm" hidePageIfEmpty="0" visibility="1" id="" position="290.617,6.0007,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65647" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="119" red="119" blue="119" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28605,21 +28605,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="47.1065,27.6,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="0" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="27.4317" zValue="1" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionOnPage="246.665,178.41,mm" position="246.665,178.41,mm" outlineWidthM="0.3,mm" pictureHeight="27.6">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" pictureWidth="27.4317" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="47.1065,27.6,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="27.6" referencePoint="0" pictureRotation="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionOnPage="246.665,178.41,mm" visibility="1" id="" northMode="0" position="246.665,178.41,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="0" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28627,14 +28627,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" stylesheetEnabled="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;}" 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>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" url="" evaluateExpressions="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" contentMode="1" type="65648" maxBreakDistance="12">
-        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame maxBreakDistance="12" 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" url="" evaluateExpressions="true" useSmartBreaks="true" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" 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;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true">
+        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28644,53 +28644,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="rasterize" type="QString"/>
-          <Option value="3.53" name="resizeToContentsBottomMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsLeftMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsRightMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsTopMargin" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropMarginUnit" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="rasterize" value="false" type="QString"/>
+          <Option name="resizeToContentsBottomMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsLeftMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsRightMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsTopMargin" value="3.53" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" coverageLayerProvider="ogr" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" sortFeatures="1" sortKey="position" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" pageNameExpression="&quot;position&quot;"/>
+      <Atlas coverageLayerName="marshal_positions" hideCoverage="0" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;position&quot;" 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;" sortKey="position" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="300" worldFileMap="" name="Start &amp; Finish Backgrounds">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" worldFileMap="" units="mm" printResolution="300">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28705,49 +28705,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28762,9 +28762,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28772,21 +28772,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="true" pictureRotation="330" size="9.45865,11,mm" opacity="1" file="arrows/NorthArrow_11.svg" frameJoinStyle="miter" anchorPoint="0" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="6.31767" zValue="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" excludeFromExports="0" mode="0" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionOnPage="286.027,2,mm" position="286.027,2,mm" outlineWidthM="0.3,mm" pictureHeight="7.97477">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="6.31767" northOffset="0" mode="0" blendMode="0" svgBorderWidth="0.2" size="9.45865,11,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="7.97477" referencePoint="0" pictureRotation="330" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionOnPage="286.027,2,mm" visibility="1" id="" northMode="0" position="286.027,2,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="0" background="false" positionLock="true" file="arrows/NorthArrow_11.svg" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28794,47 +28794,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="142.543,10.3185,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="3" groupUuid="" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" itemRotation="270" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionOnPage="285.027,205.886,mm" position="285.027,205.886,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="270" zValue="3" halign="1" blendMode="0" size="142.543,10.3185,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionOnPage="285.027,205.886,mm" visibility="1" id="" position="285.027,205.886,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -28849,65 +28849,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" labelBarSpace="3" alignment="0" type="65646" positionLock="true" maxBarWidth="150" labelHorizontalPlacement="0" opacity="1" outlineWidth="0.3" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" groupUuid="" positionOnPage="7,189.669,mm" lineCapStyle="square" numSubdivisions="1" position="7,189.669,mm" excludeFromExports="0" itemRotation="0" style="Single Box" segmentMillimeters="26.3519" visibility="1" boxContentSpace="1" blendMode="0" height="3" frameJoinStyle="miter" numMapUnitsPerScaleBarUnit="1" size="145.54,16.2165,mm" minBarWidth="50" subdivisionsHeight="1.5" numSegmentsLeft="2" numSegments="4" zValue="2" labelVerticalPlacement="0" lineJoinStyle="miter" unitType="meters" id="" segmentSizeMode="1" numUnitsPerSegment="100" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" background="false" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem maxBarWidth="150" boxContentSpace="1" numSubdivisions="1" frameJoinStyle="miter" labelHorizontalPlacement="0" blendMode="0" subdivisionsHeight="1.5" opacity="1" background="false" numUnitsPerSegment="100" positionLock="true" groupUuid="" frame="false" referencePoint="0" lineJoinStyle="miter" segmentMillimeters="26.3519" size="145.54,16.2165,mm" segmentSizeMode="1" alignment="0" lineCapStyle="square" style="Single Box" id="" height="3" zValue="2" labelBarSpace="3" type="65646" numSegments="4" position="7,189.669,mm" unitLabel="m" unitType="meters" outlineWidthM="0.3,mm" minBarWidth="50" labelVerticalPlacement="0" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" positionOnPage="7,189.669,mm" visibility="1" excludeFromExports="0" itemRotation="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidth="0.3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -28922,75 +28922,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor green="0" red="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option name="decimal_separator" value="" type="QChar"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29021,52 +29021,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29097,52 +29097,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29173,36 +29173,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -29217,36 +29217,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29261,40 +29261,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="278.027,180.318,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="false" followPresetName="Start/Finish" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="330" groupUuid="" blendMode="0" itemRotation="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionOnPage="7,5.5,mm" followPreset="true" keepLayerSet="false" position="7,5.5,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="330" blendMode="0" size="278.027,180.318,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Start/Finish" referencePoint="0" isTemporal="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionOnPage="7,5.5,mm" visibility="1" id="" position="7,5.5,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="false" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="rotation" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="rotation" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="id" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="id" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29303,45 +29303,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="3" annotationExpression="" topAnnotationDisplay="3" crossLength="3" position="3" annotationFormat="4" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="5" gridFramePenThickness="0.5" intervalX="5" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" unit="1" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="5" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="3" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="3" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="1" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="4" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" frameAnnotationDistance="1" leftAnnotationDisplay="3" minimumIntervalWidth="50" bottomAnnotationDisplay="3" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29372,44 +29372,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29432,9 +29432,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29451,32 +29451,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29491,29 +29491,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29521,65 +29521,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
+          <Option name="svgCropMarginBottom" value="0" type="QString"/>
+          <Option name="svgCropMarginLeft" value="0" type="QString"/>
+          <Option name="svgCropMarginRight" value="0" type="QString"/>
+          <Option name="svgCropMarginTop" value="0" type="QString"/>
+          <Option name="svgCropToContents" value="true" type="QString"/>
+          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
+          <Option name="svgGroupLayers" value="false" type="QString"/>
+          <Option name="svgIncludeMetadata" value="1" type="QString"/>
+          <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" sortFeatures="1" sortKey="area" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;"/>
+      <Atlas coverageLayerName="start_finish_area" hideCoverage="1" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;area&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="300" worldFileMap="" name="Fencing">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Fencing" worldFileMap="" units="mm" printResolution="300">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -29594,49 +29594,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29651,9 +29651,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29661,15 +29661,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" groupUuid="" positionOnPage="256.808,5.21277,mm" symbolWidth="7" position="256.808,5.21277,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="38.1563,67.2879,mm" fontColor="#000000" zValue="11" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="0" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="38.1563,67.2879,mm" rasterBorder="1" resizeToContents="0" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="11" wmsLegendHeight="25" title="" type="65642" position="256.808,5.21277,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" positionOnPage="256.808,5.21277,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29677,53 +29677,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" style="Bold" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" source="./fencing.shp|layername=fencing" expanded="1" name="fencing" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29731,47 +29731,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="148.46,6.45211,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="10" groupUuid="" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" itemRotation="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="10" halign="1" blendMode="0" size="148.46,6.45211,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionOnPage="6.76779,191.188,mm" visibility="1" id="" position="6.76779,191.188,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29786,65 +29786,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="56.3557,6.45237,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="9" groupUuid="" blendMode="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" itemRotation="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="9" halign="2" blendMode="0" size="56.3557,6.45237,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionOnPage="182.723,191.188,mm" visibility="1" id="" position="182.723,191.188,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29859,65 +29859,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="26.8205,6.82826,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="REVISION 1.0" itemRotation="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="2" blendMode="0" size="26.8205,6.82826,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 1.0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionOnPage="209.146,198.083,mm" visibility="1" id="" position="209.146,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29932,65 +29932,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="51.1638,7.07327,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" halign="1" blendMode="0" size="51.1638,7.07327,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionOnPage="62.6706,198.083,mm" visibility="1" id="" position="62.6706,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30005,65 +30005,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="64.7594,7.10512,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="1" blendMode="0" size="64.7594,7.10512,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionOnPage="116.805,198.083,mm" visibility="1" id="" position="116.805,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30078,65 +30078,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="52.7903,7.07327,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="1" blendMode="0" size="52.7903,7.07327,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionOnPage="6.76779,198.083,mm" visibility="1" id="" position="6.76779,198.083,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30151,39 +30151,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="49.3143,29.8354,mm" opacity="1" file="../GunRun2022_250.png" frameJoinStyle="miter" anchorPoint="8" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="49.3143" zValue="4" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureHeight="26.4325">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="49.3143" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="49.3143,29.8354,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="26.4325" referencePoint="0" pictureRotation="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionOnPage="243.098,175.353,mm" visibility="1" id="" northMode="0" position="243.098,175.353,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="8" background="false" positionLock="true" file="../GunRun2022_250.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30191,42 +30191,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="232.01,0.14328,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="3" groupUuid="" blendMode="0" itemRotation="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" blendMode="0" size="232.01,0.14328,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" id="" position="6.91779,197.79,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -30241,55 +30241,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem referencePoint="0" labelBarSpace="1" alignment="0" type="65646" positionLock="true" maxBarWidth="100" labelHorizontalPlacement="0" opacity="1" outlineWidth="0.2" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" groupUuid="" positionOnPage="6.76779,2.8482,mm" lineCapStyle="square" numSubdivisions="1" position="6.76779,2.8482,mm" excludeFromExports="0" itemRotation="0" style="Double Box" segmentMillimeters="31.3239" visibility="1" boxContentSpace="0.2" blendMode="0" height="2" frameJoinStyle="miter" numMapUnitsPerScaleBarUnit="1" size="103.733,15.8378,mm" minBarWidth="25" subdivisionsHeight="1.5" numSegmentsLeft="2" numSegments="2" zValue="2" labelVerticalPlacement="0" lineJoinStyle="round" unitType="meters" id="" segmentSizeMode="1" numUnitsPerSegment="40" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" background="false" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem maxBarWidth="100" boxContentSpace="0.2" numSubdivisions="1" frameJoinStyle="miter" labelHorizontalPlacement="0" blendMode="0" subdivisionsHeight="1.5" opacity="1" background="false" numUnitsPerSegment="40" positionLock="true" groupUuid="" frame="false" referencePoint="0" lineJoinStyle="round" segmentMillimeters="31.3239" size="103.733,15.8378,mm" segmentSizeMode="1" alignment="0" lineCapStyle="square" style="Double Box" id="" height="2" zValue="2" labelBarSpace="1" type="65646" numSegments="2" position="6.76779,2.8482,mm" unitLabel="m" unitType="meters" outlineWidthM="0.3,mm" minBarWidth="25" labelVerticalPlacement="0" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" positionOnPage="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" itemRotation="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidth="0.2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="0"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30304,75 +30304,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor green="0" red="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option name="decimal_separator" value="" type="QChar"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30403,52 +30403,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30479,52 +30479,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer enabled="1" class="SimpleLine" pass="0" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30555,36 +30555,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -30599,36 +30599,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30643,46 +30643,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="283.418,180.92,mm" opacity="0.9" mapFlags="0" frameJoinStyle="miter" background="false" followPresetName="Fencing" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionOnPage="6.76779,9.35102,mm" followPreset="true" keepLayerSet="false" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="283.418,180.92,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" opacity="0.9" labelMargin="0,mm" mapFlags="0" followPresetName="Fencing" referencePoint="0" isTemporal="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionOnPage="6.76779,9.35102,mm" visibility="1" id="" position="6.76779,9.35102,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="false" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
                   <Option name="transformer" type="Map">
                     <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+                      <Option name="exponent" value="1" type="double"/>
+                      <Option name="maxOutput" value="360" type="double"/>
+                      <Option name="maxValue" value="0" type="double"/>
+                      <Option name="minOutput" value="0" type="double"/>
+                      <Option name="minValue" value="0" type="double"/>
+                      <Option name="nullOutput" value="0" type="double"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option name="t" value="0" type="int"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30704,45 +30704,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="3" annotationExpression="" topAnnotationDisplay="3" crossLength="3" position="3" annotationFormat="4" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="5" gridFramePenThickness="0.5" intervalX="5" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" unit="1" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="5" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="3" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="3" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="1" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="4" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" frameAnnotationDistance="1" leftAnnotationDisplay="3" minimumIntervalWidth="50" bottomAnnotationDisplay="3" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -30773,44 +30773,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -30833,9 +30833,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30852,32 +30852,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -30892,29 +30892,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30922,65 +30922,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" hideCoverage="1" sortFeatures="1" sortKey="&quot;group&quot;" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;"/>
+      <Atlas coverageLayerName="fence_groups" hideCoverage="1" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" sortKey="&quot;group&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="9" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="9" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -30995,49 +30995,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31052,59 +31052,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="false" size="83.9998,10.4638,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="Directions to Start of Race" itemRotation="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionOnPage="4.43449,186.634,mm" position="4.43449,186.634,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="1" blendMode="0" size="83.9998,10.4638,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Directions to Start of Race" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionOnPage="4.43449,186.634,mm" visibility="1" id="" position="4.43449,186.634,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31119,65 +31119,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="48.2923,9.511,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="Gun Run" itemRotation="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionOnPage="4.43449,197.498,mm" position="4.43449,197.498,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" halign="1" blendMode="0" size="48.2923,9.511,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Gun Run" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionOnPage="4.43449,197.498,mm" visibility="1" id="" position="4.43449,197.498,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31192,33 +31192,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByMap="1" groupUuid="" positionOnPage="10.096,10.8563,mm" symbolWidth="9" position="10.096,10.8563,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="0" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="round" size="59.0766,76,mm" fontColor="#000000" zValue="6" equalColumnWidth="0" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="2" symbolHeight="5" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="139" red="139" green="139"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="0" frameJoinStyle="round" blendMode="0" opacity="1" background="true" positionLock="false" groupUuid="" legendFilterByMap="1" symbolHeight="5" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="59.0766,76,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="0" id="" zValue="6" wmsLegendHeight="25" title="" type="65642" position="10.096,10.8563,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="9" columnCount="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" positionOnPage="10.096,10.8563,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="2">
+        <FrameColor green="139" red="139" blue="139" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31226,52 +31226,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="3" marginTop="2.5" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="3" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Ask Me">
+          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" expanded="1" name="poi_labels" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Checked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
+                  <Option name="legend/label-1" value="Toilets" type="QString"/>
+                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
+                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
+                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
+                  <Option name="legend/label-5" value="Parking" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Checked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
+                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
+                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31279,47 +31279,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="27.7839,6.871,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="REVISION 1.0" itemRotation="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionOnPage="221.862,190.027,mm" position="221.862,190.027,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="27.7839,6.871,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 1.0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionOnPage="221.862,190.027,mm" visibility="1" id="" position="221.862,190.027,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31334,65 +31334,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="51.6706,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="4" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionOnPage="197.975,197.498,mm" position="197.975,197.498,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" halign="2" blendMode="0" size="51.6706,6.60801,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionOnPage="197.975,197.498,mm" visibility="1" id="" position="197.975,197.498,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="false" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31407,39 +31407,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="false" pictureRotation="0" size="42.9838,24.3824,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="24.2337" zValue="3" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionOnPage="249.646,179.724,mm" position="249.646,179.724,mm" outlineWidthM="0.3,mm" pictureHeight="24.3824">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" pictureWidth="24.2337" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="42.9838,24.3824,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="24.3824" referencePoint="0" pictureRotation="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionOnPage="249.646,179.724,mm" visibility="1" id="" northMode="0" position="249.646,179.724,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="false" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31447,42 +31447,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="244.912,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="2" groupUuid="" blendMode="0" itemRotation="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionOnPage="4.58449,197.248,mm" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" blendMode="0" size="244.912,0.1,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionOnPage="4.58449,197.248,mm" shapeType="1" visibility="1" id="" position="4.58449,197.248,mm" excludeFromExports="0" frame="false" background="false" positionLock="false" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -31497,39 +31497,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="288.007,183.616,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Ask Me" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="4.43449,6.411,mm" followPreset="true" keepLayerSet="false" position="4.43449,6.411,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="288.007,183.616,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Ask Me" referencePoint="0" isTemporal="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="4.43449,6.411,mm" visibility="1" id="" position="4.43449,6.411,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="true" positionLock="false" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31551,45 +31551,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -31620,44 +31620,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -31680,40 +31680,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -31728,29 +31728,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31758,56 +31758,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" hideCoverage="0" sortFeatures="0" filterFeatures="0" enabled="0" pageNameExpression=""/>
+      <Atlas hideCoverage="0" enabled="0" sortFeatures="0" pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="" name="Routes">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Routes" worldFileMap="" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31822,49 +31822,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31879,59 +31879,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="true" size="61.5373,6.8714,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="13" groupUuid="" blendMode="0" labelText="REVISION 3.2" itemRotation="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionOnPage="200.171,199.082,mm" position="200.171,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="13" halign="2" blendMode="0" size="61.5373,6.8714,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 3.2" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionOnPage="200.171,199.082,mm" visibility="1" id="" position="200.171,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31946,65 +31946,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="61.5373,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="12" groupUuid="" blendMode="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" itemRotation="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionOnPage="9.7863,192.073,mm" position="9.7863,192.073,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="12" halign="1" blendMode="0" size="61.5373,6.60801,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionOnPage="9.7863,192.073,mm" visibility="1" id="" position="9.7863,192.073,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32019,65 +32019,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="61.5373,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="0" frame="false" id="" zValue="11" groupUuid="" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" itemRotation="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionOnPage="9.7863,199.082,mm" position="9.7863,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="11" halign="1" blendMode="0" size="61.5373,6.60801,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionOnPage="9.7863,199.082,mm" visibility="1" id="" position="9.7863,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="0">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32092,39 +32092,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" opacity="1" file="../GunRun2022_250.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="29.7523" zValue="10" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureHeight="15.9472">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="10" pictureWidth="29.7523" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="29.7523,17.4718,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="15.9472" referencePoint="0" pictureRotation="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionOnPage="262.196,188.218,mm" visibility="1" id="" northMode="0" position="262.196,188.218,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="true" file="../GunRun2022_250.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32132,42 +32132,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="251.982,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="9" groupUuid="" blendMode="0" itemRotation="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionOnPage="9.57644,198.832,mm" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="9" blendMode="0" size="251.982,0.1,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionOnPage="9.57644,198.832,mm" shapeType="1" visibility="1" id="" position="9.57644,198.832,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -32182,29 +32182,29 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="107.861,186.385,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Trail Finish" isTemporal="0" zValue="8" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" excludeFromExports="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionOnPage="9.57644,5.42566,mm" followPreset="true" keepLayerSet="false" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" keepLayerSet="false" mapRotation="0" blendMode="0" size="107.861,186.385,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionOnPage="9.57644,5.42566,mm" visibility="1" id="Trail Finish" position="9.57644,5.42566,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32213,28 +32213,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905" ymin="-33.93243205975926458"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="179.156,189.279,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Trail Start" isTemporal="0" zValue="7" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" excludeFromExports="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionOnPage="112.643,4.09761,mm" followPreset="true" keepLayerSet="false" position="112.643,4.09761,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" keepLayerSet="false" mapRotation="0" blendMode="0" size="179.156,189.279,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionOnPage="112.643,4.09761,mm" visibility="1" id="Trail Start" position="112.643,4.09761,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32243,53 +32243,53 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743" ymin="-33.95772328900195447"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="67.7828,166.874,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Left inset 21KM" isTemporal="0" zValue="6" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" excludeFromExports="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionOnPage="5.86559,4.09761,mm" followPreset="true" keepLayerSet="false" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" keepLayerSet="false" mapRotation="0" blendMode="0" size="67.7828,166.874,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionOnPage="5.86559,4.09761,mm" visibility="1" id="Left inset 21KM" position="5.86559,4.09761,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32298,28 +32298,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="113.3,76.1023,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Bottom inset 21KM" isTemporal="0" zValue="5" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" excludeFromExports="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionOnPage="133.191,119.125,mm" followPreset="true" keepLayerSet="false" position="133.191,119.125,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="144" red="103" green="34"/>
-        <BackgroundColor alpha="255" blue="215" red="200" green="175"/>
+      <LayoutItem itemRotation="0" zValue="5" keepLayerSet="false" mapRotation="0" blendMode="0" size="113.3,76.1023,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionOnPage="133.191,119.125,mm" visibility="1" id="Bottom inset 21KM" position="133.191,119.125,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="34" red="103" blue="144" alpha="255"/>
+        <BackgroundColor green="175" red="200" blue="215" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32328,28 +32328,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
+        <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="68.3676,117.12,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="0" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="End inset Trail" isTemporal="0" zValue="4" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" excludeFromExports="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionOnPage="19.6693,7.89412,mm" followPreset="true" keepLayerSet="false" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" keepLayerSet="false" mapRotation="0" blendMode="0" size="68.3676,117.12,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionOnPage="19.6693,7.89412,mm" visibility="0" id="End inset Trail" position="19.6693,7.89412,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32358,28 +32358,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005" ymin="-33.91454383501641701"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="63.655,88.3012,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="0" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Start inset Trail" isTemporal="0" zValue="3" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" excludeFromExports="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionOnPage="170.062,49.6297,mm" followPreset="true" keepLayerSet="false" position="170.062,49.6297,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" keepLayerSet="false" mapRotation="0" blendMode="0" size="63.655,88.3012,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionOnPage="170.062,49.6297,mm" visibility="0" id="Start inset Trail" position="170.062,49.6297,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32388,28 +32388,28 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591" ymin="-33.94823764719958348"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="75.8756,69.7635,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Routes" visibility="0" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Contour inset Trail" isTemporal="0" zValue="2" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" excludeFromExports="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" positionOnPage="200.321,125.314,mm" followPreset="true" keepLayerSet="false" position="200.321,125.314,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" keepLayerSet="false" mapRotation="0" blendMode="0" size="75.8756,69.7635,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" positionOnPage="200.321,125.314,mm" visibility="0" id="Contour inset Trail" position="200.321,125.314,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32418,38 +32418,38 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047" ymin="-33.95702588572736147"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="282.372,186.105,mm" opacity="1" mapFlags="0" frameJoinStyle="round" background="true" followPresetName="Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="Main Map" isTemporal="0" zValue="1" drawCanvasItems="true" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionOnPage="9.50144,5.50066,mm" followPreset="true" keepLayerSet="false" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="282.372,186.105,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.15,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Routes" referencePoint="0" isTemporal="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionOnPage="9.50144,5.50066,mm" visibility="1" id="Main Map" position="9.50144,5.50066,mm" excludeFromExports="0" frame="true" drawCanvasItems="true" background="true" positionLock="false" followPreset="true" type="65639" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32458,45 +32458,45 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.36400000000000077" xmax="18.45389078049076304" ymax="-33.89975491900725046" ymin="-33.95900000000000318"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -32527,44 +32527,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -32587,40 +32587,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -32635,29 +32635,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32665,34 +32665,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" centered="0" name="Overview 1" position="3" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" show="1">
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <ComposerMapOverview name="Overview 1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" show="1" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" blendMode="0" centered="0">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties" type="Map">
                   <Option name="alpha" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="103,34,144,26" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="103,34,144,26" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="103,34,144,26" k="color"/>
@@ -32707,9 +32707,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32717,9 +32717,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32727,63 +32727,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="all_routes" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" hideCoverage="0" sortFeatures="1" sortKey="&quot;Sort&quot;" sortAscending="1" filterFeatures="1" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;"/>
+      <Atlas coverageLayerName="all_routes" hideCoverage="0" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" 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'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortKey="&quot;Sort&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1"/>
     </Layout>
-    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan A1">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Marshal Plan A1" worldFileMap="" units="mm" printResolution="120">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -32798,49 +32798,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="594,841,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="594,841,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -32855,9 +32855,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32865,15 +32865,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" groupUuid="" positionOnPage="25.5925,18.7971,mm" symbolWidth="7" position="25.5925,18.7971,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="4,4,mm" fontColor="#000000" zValue="8" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="false" referencePoint="0" maxSymbolSize="0" size="4,4,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="8" wmsLegendHeight="25" title="" type="65642" position="25.5925,18.7971,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" positionOnPage="25.5925,18.7971,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32881,37 +32881,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="1" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" legend_split_behavior="0" id="all_routes20170907054841602" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32919,47 +32919,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="91.9494,15.0649,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="MARSHAL POSITIONS" itemRotation="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionOnPage="5.2963,808.939,mm" position="5.2963,808.939,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="7" halign="1" blendMode="0" size="91.9494,15.0649,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="MARSHAL POSITIONS" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionOnPage="5.2963,808.939,mm" visibility="1" id="" position="5.2963,808.939,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32974,65 +32974,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="56.6212,15.3656,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="REVISION 1.2" itemRotation="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionOnPage="430.403,825.052,mm" position="430.403,825.052,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="56.6212,15.3656,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 1.2" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionOnPage="430.403,825.052,mm" visibility="1" id="" position="430.403,825.052,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33047,65 +33047,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="114.848,15.0635,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="4" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionOnPage="372.175,808.942,mm" position="372.175,808.942,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" halign="2" blendMode="0" size="114.848,15.0635,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionOnPage="372.175,808.942,mm" visibility="1" id="" position="372.175,808.942,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33120,39 +33120,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="100.498,63.9757,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="8" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="63.5856" zValue="3" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionOnPage="489.557,775.395,mm" position="489.557,775.395,mm" outlineWidthM="0.3,mm" pictureHeight="63.9757">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" pictureWidth="63.5856" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="100.498,63.9757,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="63.9757" referencePoint="0" pictureRotation="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionOnPage="489.557,775.395,mm" visibility="1" id="" northMode="0" position="489.557,775.395,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="8" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33160,42 +33160,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="481.428,0.606138,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="2" groupUuid="" blendMode="0" itemRotation="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionOnPage="5.4463,824.155,mm" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" blendMode="0" size="481.428,0.606138,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionOnPage="5.4463,824.155,mm" shapeType="1" visibility="1" id="" position="5.4463,824.155,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33210,39 +33210,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="584.759,811.213,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Marshal overview" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" excludeFromExports="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionOnPage="3.94474,5.25965,mm" followPreset="true" keepLayerSet="false" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="584.759,811.213,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal overview" referencePoint="0" isTemporal="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionOnPage="3.94474,5.25965,mm" visibility="1" id="" position="3.94474,5.25965,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33251,49 +33251,49 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
         <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" sortFeatures="1" sortKey="page" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" pageNameExpression="&quot;page&quot;"/>
+      <Atlas coverageLayerName="complete_marshal_overview" hideCoverage="1" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="" name="Access Roads">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Access Roads" worldFileMap="" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -33308,49 +33308,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -33365,27 +33365,27 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" groupUuid="" positionOnPage="244.484,130.172,mm" symbolWidth="7" position="244.484,130.172,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="34.45,40.8,mm" fontColor="#000000" zValue="15" equalColumnWidth="0" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="185" blue="255" red="255" green="255"/>
+      <LayoutItem equalColumnWidth="0" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="true" referencePoint="0" maxSymbolSize="0" size="34.45,40.8,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="15" wmsLegendHeight="25" title="" type="65642" position="244.484,130.172,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" positionOnPage="244.484,130.172,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33393,35 +33393,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="3" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="3" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2.5" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" style="Regular" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Residents Access">
+          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Checked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33429,47 +33429,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="194.851,7.272,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" itemRotation="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="1" blendMode="0" size="194.851,7.272,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionOnPage="9.37446,191.81,mm" visibility="1" id="" position="9.37446,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33484,65 +33484,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="57.4836,6.8714,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="REVISION 1.1" itemRotation="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="2" blendMode="0" size="57.4836,6.8714,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="REVISION 1.1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionOnPage="204.225,191.81,mm" visibility="1" id="" position="204.225,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33557,65 +33557,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="51.6706,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="51.6706,6.60801,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionOnPage="210.038,199.082,mm" visibility="1" id="" position="210.038,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33630,39 +33630,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="17.3653" zValue="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="17.3653" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="29.7523,17.4718,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="17.4718" referencePoint="0" pictureRotation="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionOnPage="262.196,188.218,mm" visibility="1" id="" northMode="0" position="262.196,188.218,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33670,42 +33670,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="251.959,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="3" groupUuid="" blendMode="0" itemRotation="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" blendMode="0" size="251.959,0.1,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" id="" position="9.59946,198.832,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33720,54 +33720,54 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="67.7828,166.874,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Access Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="2" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" excludeFromExports="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionOnPage="5.86559,4.09761,mm" followPreset="true" keepLayerSet="false" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" keepLayerSet="false" mapRotation="0" blendMode="0" size="67.7828,166.874,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Access Routes" referencePoint="0" isTemporal="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionOnPage="5.86559,4.09761,mm" visibility="1" id="" position="5.86559,4.09761,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33789,45 +33789,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -33858,44 +33858,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -33918,40 +33918,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -33966,29 +33966,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33996,38 +33996,38 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="282.012,175.592,mm" opacity="1" mapFlags="0" frameJoinStyle="round" background="true" followPresetName="Access Routes" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="true" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionOnPage="9.44946,9.08557,mm" followPreset="true" keepLayerSet="false" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="282.012,175.592,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.15,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Access Routes" referencePoint="0" isTemporal="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionOnPage="9.44946,9.08557,mm" visibility="1" id="" position="9.44946,9.08557,mm" excludeFromExports="0" frame="true" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34049,45 +34049,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34118,44 +34118,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34178,40 +34178,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34226,29 +34226,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34256,56 +34256,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;"/>
+      <Atlas coverageLayerName="residents_access" hideCoverage="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm" printResolution="144">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -34320,49 +34320,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,210,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,210,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -34377,59 +34377,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="true" size="194.851,7.272,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="8" groupUuid="" blendMode="0" labelText="Access to P9 Parking and VIP Tent" itemRotation="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="1" blendMode="0" size="194.851,7.272,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionOnPage="9.37446,191.81,mm" visibility="1" id="" position="9.37446,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34444,65 +34444,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="57.4836,6.8714,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="REVISION 1.0" itemRotation="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="2" blendMode="0" size="57.4836,6.8714,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="REVISION 1.0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionOnPage="204.225,191.81,mm" visibility="1" id="" position="204.225,191.81,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34517,65 +34517,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="51.6706,6.60801,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="Sunday, 20 October 2019" itemRotation="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0" htmlState="0" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="2" blendMode="0" size="51.6706,6.60801,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="Sunday, 20 October 2019" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionOnPage="210.038,199.082,mm" visibility="1" id="" position="210.038,199.082,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="1" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34590,39 +34590,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" opacity="1" file="../Gun_Run_Logo.png" frameJoinStyle="miter" anchorPoint="4" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="17.3653" zValue="4" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" pictureWidth="17.3653" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="29.7523,17.4718,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="17.4718" referencePoint="0" pictureRotation="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionOnPage="262.196,188.218,mm" visibility="1" id="" northMode="0" position="262.196,188.218,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="4" background="false" positionLock="true" file="../Gun_Run_Logo.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34630,42 +34630,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="251.959,0.1,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="3" groupUuid="" blendMode="0" itemRotation="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" blendMode="0" size="251.959,0.1,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" id="" position="9.59946,198.832,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34680,39 +34680,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="false" size="282.012,182.649,mm" opacity="1" mapFlags="0" frameJoinStyle="round" background="true" followPresetName="" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" excludeFromExports="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionOnPage="9.44946,7.25098,mm" followPreset="false" keepLayerSet="false" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="282.012,182.649,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" outlineWidthM="0.15,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="" referencePoint="0" isTemporal="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionOnPage="9.44946,7.25098,mm" visibility="1" id="" position="9.44946,7.25098,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="true" positionLock="false" followPreset="false" type="65639" groupUuid="" frameJoinStyle="round">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34734,45 +34734,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" rightAnnotationDisplay="0" annotationExpression="" topAnnotationDisplay="0" crossLength="3" position="3" annotationFormat="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="0" gridFrameWidth="2" gridFrameSideFlags="15" rotatedTicksMinimumAngle="0" gridStyle="0" gridFrameStyle="0" rightAnnotationDirection="0" topAnnotationPosition="1" rotatedTicksLengthMode="0" rightAnnotationPosition="1" leftFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" minimumIntervalWidth="50" frameAnnotationDistance="1" show="0" showAnnotation="0" bottomFrameDivisions="0" offsetX="0" gridFramePenColor="0,0,0,255" name="Grid 1" intervalY="0" gridFramePenThickness="0.5" intervalX="0" offsetY="0" leftAnnotationPosition="1" frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" leftAnnotationDisplay="0" rotatedAnnotationsEnabled="0" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" unit="0" gridFrameMargin="0">
+        <ComposerMapGrid name="Grid 1" intervalX="0" crossLength="3" leftFrameDivisions="0" blendMode="0" gridFrameWidth="2" offsetX="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" topAnnotationDisplay="0" gridFrameSideFlags="15" frameFillColor1="255,255,255,255" showAnnotation="0" frameFillColor2="0,0,0,255" rightAnnotationPosition="1" annotationExpression="" rightAnnotationDisplay="0" gridFramePenThickness="0.5" show="0" rotatedAnnotationsEnabled="0" topAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" annotationPrecision="3" unit="0" gridFrameMargin="0" gridStyle="0" rotatedAnnotationsLengthMode="0" rotatedTicksMinimumAngle="0" bottomAnnotationPosition="1" maximumIntervalWidth="100" topAnnotationPosition="1" leftAnnotationDirection="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" position="3" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" bottomAnnotationDirection="0" gridFrameStyle="0" annotationFormat="0" rotatedTicksEnabled="0" rightFrameDivisions="0" bottomFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" leftAnnotationDisplay="0" minimumIntervalWidth="50" bottomAnnotationDisplay="0" topFrameDivisions="0" offsetY="0" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="line">
+            <symbol name="" clip_to_extent="1" type="line" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer enabled="1" class="SimpleLine" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34803,44 +34803,44 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="marker">
+            <symbol name="" clip_to_extent="1" type="marker" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer enabled="1" class="SimpleMarker" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34863,40 +34863,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+          <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
             <families/>
-            <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-            <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-              <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+              <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34911,29 +34911,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34941,56 +34941,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;"/>
+      <Atlas coverageLayerName="residents_access" hideCoverage="1" coverageLayerProvider="ogr" enabled="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan">
-      <Snapper snapToItems="1" snapToGrid="0" snapToGuides="1" tolerance="5"/>
-      <Grid resolution="10" resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0"/>
+    <Layout name="Marshal Plan" worldFileMap="" units="mm" printResolution="120">
+      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35005,49 +35005,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionLock="false" size="297,420,mm" opacity="1" frameJoinStyle="miter" background="true" visibility="1" referencePoint="0" type="65638" frame="false" id="" zValue="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" excludeFromExports="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem itemRotation="0" zValue="0" blendMode="0" size="297,420,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionOnPage="0,0,mm" visibility="1" id="" position="0,0,mm" excludeFromExports="0" frame="false" background="true" positionLock="false" type="65638" groupUuid="" frameJoinStyle="miter">
+          <FrameColor green="0" red="0" blue="0" alpha="255"/>
+          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer enabled="1" class="SimpleFill" pass="0" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35062,9 +35062,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35072,47 +35072,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="true" size="23.5967,8.3142,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="4" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="14" groupUuid="" blendMode="0" labelText="Page [% &quot;page&quot; %] " itemRotation="0" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionOnPage="112.086,406.476,mm" position="112.086,406.476,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="9" halign="4" blendMode="0" size="23.5967,8.3142,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="Page [% &quot;page&quot; %] " uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionOnPage="112.086,406.476,mm" visibility="1" id="" position="112.086,406.476,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35127,33 +35127,106 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" wrapChar="" type="65642" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" rasterBorder="1" maxSymbolSize="0" opacity="1" title="" boxSpace="2" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" groupUuid="" positionOnPage="15.6525,12.5708,mm" symbolWidth="7" position="15.6525,12.5708,mm" wmsLegendHeight="25" wmsLegendWidth="50" excludeFromExports="0" itemRotation="0" columnSpace="2" columnCount="1" visibility="1" rasterBorderColor="0,0,0,255" blendMode="0" frameJoinStyle="miter" size="21.6797,33,mm" fontColor="#000000" zValue="8" equalColumnWidth="1" rasterBorderWidth="0" symbolAlignment="1" legendFilterByAtlas="0" id="" minSymbolSize="0" lineSpacing="1" symbolHeight="4" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" splitLayer="0" outlineWidthM="0.3,mm" resizeToContents="1" titleAlignment="1" background="true" frame="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="8" halign="2" blendMode="0" size="27.7839,7.51682,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="REVISION 3.2" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionOnPage="214.292,406.874,mm" visibility="1" id="" position="214.292,406.874,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
+          <families/>
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </data_defined_properties>
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
+                <Option type="Map">
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,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="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties"/>
+                    <Option name="type" value="collection" type="QString"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem equalColumnWidth="1" frameJoinStyle="miter" blendMode="0" opacity="1" background="true" positionLock="true" groupUuid="" symbolHeight="4" wmsLegendWidth="50" frame="false" referencePoint="0" maxSymbolSize="0" size="21.6797,33,mm" rasterBorder="1" resizeToContents="1" wrapChar="" titleAlignment="1" columnSpace="2" id="" zValue="7" wmsLegendHeight="25" title="" type="65642" position="15.6525,12.5708,mm" outlineWidthM="0.3,mm" minSymbolSize="0" symbolWidth="7" columnCount="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" rasterBorderColor="0,0,0,255" fontColor="#000000" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" positionOnPage="15.6525,12.5708,mm" visibility="1" excludeFromExports="0" itemRotation="0" splitLayer="0" boxSpace="2" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" rasterBorderWidth="0" symbolAlignment="1" lineSpacing="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35161,37 +35234,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="title" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="group" alignment="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="1" alignment="1" name="subgroup">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="subgroup" alignment="1" marginTop="1" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" marginTop="2" alignment="1" name="symbol">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" style="" italic="0" strikethrough="0"/>
+          <style name="symbol" alignment="1" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="0" underline="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" marginLeft="2" marginTop="2" alignment="1" name="symbolLabel">
-            <styleFont underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" style="Semibold" italic="0" strikethrough="0"/>
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2" indent="0">
+            <styleFont strikethrough="0" italic="0" bold="1" underline="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" groupLayer="" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" source="./all_routes.shp|layername=all_routes" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -35199,47 +35272,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="45.1194,8.13137,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="7" groupUuid="" blendMode="0" labelText="MARSHAL POSITIONS" itemRotation="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionOnPage="5.69321,398.344,mm" position="5.69321,398.344,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="6" halign="1" blendMode="0" size="45.1194,8.13137,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="MARSHAL POSITIONS" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionOnPage="5.69321,398.344,mm" visibility="1" id="" position="5.69321,398.344,mm" excludeFromExports="0" frame="false" background="false" htmlState="0" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="63" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35254,65 +35327,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="118.192,7.80192,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="1" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="6" groupUuid="" blendMode="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" itemRotation="0" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionOnPage="5.69321,406.988,mm" position="5.69321,406.988,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="5" halign="1" blendMode="0" size="118.192,7.80192,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" outlineWidthM="0.3,mm" opacity="1" valign="32" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionOnPage="5.69321,406.988,mm" visibility="1" id="" position="5.69321,406.988,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35327,65 +35400,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="27.7839,7.51682,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="32" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="5" groupUuid="" blendMode="0" labelText="REVISION 3.1" itemRotation="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" excludeFromExports="0" htmlState="0" marginX="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionOnPage="214.292,406.874,mm" position="214.292,406.874,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="4" halign="2" blendMode="0" size="93.5757,8.13167,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" outlineWidthM="0.3,mm" opacity="1" valign="64" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionOnPage="148.501,398.344,mm" visibility="1" id="" position="148.501,398.344,mm" excludeFromExports="0" frame="false" background="false" htmlState="1" positionLock="true" marginX="0" type="65641" groupUuid="" frameJoinStyle="miter" marginY="1">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
+        <text-style namedStyle="" textColor="0,0,0,255" fontSizeUnit="Point" fontStrikeout="0" blendMode="0" multilineHeight="1" previewBkgrdColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" fontLetterSpacing="0" allowHtml="0" fontUnderline="0" fontWordSpacing="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontItalic="0" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" textOpacity="1">
           <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
+          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1"/>
+          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskEnabled="0" maskJoinStyle="128" maskSizeUnits="MM" maskOpacity="1" maskSize="1.5"/>
+          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBlendMode="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeOpacity="1" shapeDraw="0">
+            <symbol name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer enabled="1" class="SimpleFill" pass="0" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35400,112 +35473,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowScale="100" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadius="1.5" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="93.5757,8.13167,mm" opacity="1" frameJoinStyle="miter" background="false" visibility="1" halign="2" valign="64" referencePoint="0" type="65641" marginY="1" frame="false" id="" zValue="4" groupUuid="" blendMode="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" itemRotation="0" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" excludeFromExports="0" htmlState="1" marginX="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionOnPage="148.501,398.344,mm" position="148.501,398.344,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="3" pictureWidth="49.3143" northOffset="0" mode="1" blendMode="0" svgBorderWidth="0.2" size="49.3143,31.2967,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" outlineWidthM="0.3,mm" opacity="1" pictureHeight="26.4325" referencePoint="0" pictureRotation="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionOnPage="243.319,382.696,mm" visibility="1" id="" northMode="0" position="243.319,382.696,mm" excludeFromExports="0" frame="false" resizeMode="0" anchorPoint="8" background="false" positionLock="true" file="../GunRun2022_250.png" type="65640" groupUuid="" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" frameJoinStyle="miter" mapUuid="">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" namedStyle="" capitalization="0" allowHtml="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontKerning="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" textOpacity="1" forcedItalic="0" fontUnderline="0" forcedBold="0">
-          <families/>
-          <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskOpacity="1"/>
-          <background shapeBorderWidth="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeRotationType="0" shapeSizeX="0" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeType="0" shapeRadiiY="0">
-            <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="fillSymbol" force_rhr="0" type="fill">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </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" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,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="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionLock="true" pictureRotation="0" size="49.3143,31.2967,mm" opacity="1" file="../GunRun2022_250.png" frameJoinStyle="miter" anchorPoint="8" background="false" resizeMode="0" visibility="1" northOffset="0" referencePoint="0" type="65640" northMode="0" frame="false" id="" pictureWidth="49.3143" zValue="3" mapUuid="" groupUuid="" blendMode="0" svgBorderColor="0,0,0,255" itemRotation="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" excludeFromExports="0" mode="1" svgBorderWidth="0.2" svgFillColor="255,255,255,255" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionOnPage="243.319,382.696,mm" position="243.319,382.696,mm" outlineWidthM="0.3,mm" pictureHeight="26.4325">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35513,42 +35513,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="236.083,0.14328,mm" opacity="1" frameJoinStyle="miter" background="false" cornerRadiusMeasure="0,mm" visibility="1" referencePoint="0" type="65643" frame="false" id="" zValue="2" groupUuid="" blendMode="0" itemRotation="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" excludeFromExports="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionOnPage="5.84321,406.626,mm" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" shapeType="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="2" blendMode="0" size="236.083,0.14328,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" outlineWidthM="0.3,mm" opacity="1" referencePoint="0" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionOnPage="5.84321,406.626,mm" shapeType="1" visibility="1" id="" position="5.84321,406.626,mm" excludeFromExports="0" frame="false" background="false" positionLock="true" type="65643" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0" name="" force_rhr="0" type="fill">
+        <symbol name="" clip_to_extent="1" type="fill" is_animated="0" alpha="1" frame_rate="10" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer enabled="1" class="SimpleFill" pass="0" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -35563,78 +35563,78 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionLock="true" size="286.94,392.396,mm" opacity="1" mapFlags="0" frameJoinStyle="miter" background="true" followPresetName="Marshal overview" visibility="1" referencePoint="0" type="65639" labelMargin="0,mm" frame="false" id="" isTemporal="0" zValue="1" drawCanvasItems="false" mapRotation="0" groupUuid="" blendMode="0" itemRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" excludeFromExports="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionOnPage="5.03,5.9483,mm" followPreset="true" keepLayerSet="false" position="5.03,5.9483,mm" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" zValue="1" keepLayerSet="false" mapRotation="0" blendMode="0" size="286.94,392.396,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" outlineWidthM="0.3,mm" opacity="1" labelMargin="0,mm" mapFlags="0" followPresetName="Marshal overview" referencePoint="0" isTemporal="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionOnPage="5.03,5.9483,mm" visibility="1" id="" position="5.03,5.9483,mm" excludeFromExports="0" frame="false" drawCanvasItems="false" background="true" positionLock="true" followPreset="true" type="65639" groupUuid="" frameJoinStyle="miter">
+        <FrameColor green="0" red="0" blue="0" alpha="255"/>
+        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4073565023609298" xmax="18.42424810950425851" ymax="-33.93679891595140674" ymin="-33.9598985186662361"/>
+        <Extent xmin="18.36924763341120581" xmax="18.38613924055453452" ymax="-33.9248732774534929" ymin="-33.94797288016832226"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" forceLabelsInside="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" enabled="0" restrictLayers="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" enabled="0" clipSource="" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" sortFeatures="1" sortKey="page" sortAscending="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;"/>
+      <Atlas coverageLayerName="marshal_overviews" hideCoverage="1" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="0"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.34670034168259889" xmax="18.44512091979134283" ymax="-33.87832298120337526" ymin="-33.93126515593153414">
+    <DefaultViewExtent xmin="18.39718457158269516" xmax="18.39795348234916972" ymax="-33.90656303278101547" ymin="-33.90697664352108376">
       <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>
@@ -35648,10 +35648,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" timeStepUnit="h" frameRate="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings timeStep="1" frameRate="1" timeStepUnit="h" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
@@ -35660,29 +35660,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="direction_format" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option name="decimal_separator" value="" type="QChar"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="direction_format" value="0" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" value="" type="QChar"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_leading_degree_zeros" type="bool"/>
-        <Option value="false" name="show_leading_zeros" type="bool"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="false" name="show_suffix" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
+        <Option name="decimal_separator" value="" type="QChar"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_leading_degree_zeros" value="false" type="bool"/>
+        <Option name="show_leading_zeros" value="false" type="bool"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_suffix" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" value="" type="QChar"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/marshal_positions.dbf b/GIS Base Map/marshal_positions.dbf
index 2d75e8e..ba378c0 100644
Binary files a/GIS Base Map/marshal_positions.dbf and b/GIS Base Map/marshal_positions.dbf differ
diff --git a/GIS Base Map/marshal_positions.shp b/GIS Base Map/marshal_positions.shp
index fe44268..b779bcd 100644
Binary files a/GIS Base Map/marshal_positions.shp and b/GIS Base Map/marshal_positions.shp differ